wok-tiny diff linux/stuff/linux-2.6.14-unpack.u @ rev 126

Update config_form()
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Feb 12 19:39:46 2017 +0100 (2017-02-12)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/linux/stuff/linux-2.6.14-unpack.u	Sun Feb 12 19:39:46 2017 +0100
     1.3 @@ -0,0 +1,33 @@
     1.4 +--- init/initramfs.c
     1.5 ++++ init/initramfs.c
     1.6 +@@ -394,25 +394,11 @@
     1.7 + 		panic(err);
     1.8 + #ifdef CONFIG_BLK_DEV_INITRD
     1.9 + 	if (initrd_start) {
    1.10 +-		int fd;
    1.11 +-		printk(KERN_INFO "checking if image is initramfs...");
    1.12 +-		err = unpack_to_rootfs((char *)initrd_start,
    1.13 +-			initrd_end - initrd_start, 1);
    1.14 +-		if (!err) {
    1.15 +-			printk(" it is\n");
    1.16 +-			unpack_to_rootfs((char *)initrd_start,
    1.17 +-				initrd_end - initrd_start, 0);
    1.18 +-			free_initrd();
    1.19 +-			return;
    1.20 +-		}
    1.21 +-		printk("it isn't (%s); looks like an initrd\n", err);
    1.22 +-		fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 700);
    1.23 +-		if (fd >= 0) {
    1.24 +-			sys_write(fd, (char *)initrd_start,
    1.25 +-					initrd_end - initrd_start);
    1.26 +-			sys_close(fd);
    1.27 +-			free_initrd();
    1.28 +-		}
    1.29 ++		printk(KERN_INFO "Unpack initramfs...");
    1.30 ++		unpack_to_rootfs((char *)initrd_start,
    1.31 ++			initrd_end - initrd_start, 0);
    1.32 ++		free_initrd();
    1.33 ++		return;
    1.34 + 	}
    1.35 + #endif
    1.36 + }