wok-tiny annotate 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
rev   line source
pascal@174 1 --- init/initramfs.c
pascal@174 2 +++ init/initramfs.c
pascal@174 3 @@ -534,27 +534,6 @@
pascal@174 4 panic(err);
pascal@174 5 #ifdef CONFIG_BLK_DEV_INITRD
pascal@174 6 if (initrd_start) {
pascal@174 7 -#ifdef CONFIG_BLK_DEV_RAM
pascal@174 8 - int fd;
pascal@174 9 - printk(KERN_INFO "checking if image is initramfs...");
pascal@174 10 - err = unpack_to_rootfs((char *)initrd_start,
pascal@174 11 - initrd_end - initrd_start, 1);
pascal@174 12 - if (!err) {
pascal@174 13 - printk(" it is\n");
pascal@174 14 - unpack_to_rootfs((char *)initrd_start,
pascal@174 15 - initrd_end - initrd_start, 0);
pascal@174 16 - free_initrd();
pascal@174 17 - return 0;
pascal@174 18 - }
pascal@174 19 - printk("it isn't (%s); looks like an initrd\n", err);
pascal@174 20 - fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 0700);
pascal@174 21 - if (fd >= 0) {
pascal@174 22 - sys_write(fd, (char *)initrd_start,
pascal@174 23 - initrd_end - initrd_start);
pascal@174 24 - sys_close(fd);
pascal@174 25 - free_initrd();
pascal@174 26 - }
pascal@174 27 -#else
pascal@174 28 printk(KERN_INFO "Unpacking initramfs...");
pascal@174 29 err = unpack_to_rootfs((char *)initrd_start,
pascal@174 30 initrd_end - initrd_start, 0);
pascal@174 31 @@ -562,7 +541,6 @@
pascal@174 32 panic(err);
pascal@174 33 printk(" done\n");
pascal@174 34 free_initrd();
pascal@174 35 -#endif
pascal@174 36 }
pascal@174 37 #endif
pascal@174 38 return 0;