wok-tiny diff linux/stuff/linux-2.6.20-unpack.u @ rev 175

Up linux 2.6.20 (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Jul 14 14:47:52 2021 +0000 (2021-07-14)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/linux/stuff/linux-2.6.20-unpack.u	Wed Jul 14 14:47:52 2021 +0000
     1.3 @@ -0,0 +1,38 @@
     1.4 +--- init/initramfs.c
     1.5 ++++ init/initramfs.c
     1.6 +@@ -534,27 +534,6 @@
     1.7 + 		panic(err);
     1.8 + #ifdef CONFIG_BLK_DEV_INITRD
     1.9 + 	if (initrd_start) {
    1.10 +-#ifdef CONFIG_BLK_DEV_RAM
    1.11 +-		int fd;
    1.12 +-		printk(KERN_INFO "checking if image is initramfs...");
    1.13 +-		err = unpack_to_rootfs((char *)initrd_start,
    1.14 +-			initrd_end - initrd_start, 1);
    1.15 +-		if (!err) {
    1.16 +-			printk(" it is\n");
    1.17 +-			unpack_to_rootfs((char *)initrd_start,
    1.18 +-				initrd_end - initrd_start, 0);
    1.19 +-			free_initrd();
    1.20 +-			return 0;
    1.21 +-		}
    1.22 +-		printk("it isn't (%s); looks like an initrd\n", err);
    1.23 +-		fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 0700);
    1.24 +-		if (fd >= 0) {
    1.25 +-			sys_write(fd, (char *)initrd_start,
    1.26 +-					initrd_end - initrd_start);
    1.27 +-			sys_close(fd);
    1.28 +-			free_initrd();
    1.29 +-		}
    1.30 +-#else
    1.31 + 		printk(KERN_INFO "Unpacking initramfs...");
    1.32 + 		err = unpack_to_rootfs((char *)initrd_start,
    1.33 + 			initrd_end - initrd_start, 0);
    1.34 +@@ -562,7 +541,6 @@
    1.35 + 			panic(err);
    1.36 + 		printk(" done\n");
    1.37 + 		free_initrd();
    1.38 +-#endif
    1.39 + 	}
    1.40 + #endif
    1.41 + 	return 0;