patch-2.0.34 linux/fs/super.c

• Lines: 24
• Date: Wed Jun 3 15:17:49 1998
• Orig file: v2.0.33/linux/fs/super.c
• Orig date: Mon Aug 18 13:01:15 1997

diff -u --recursive --new-file v2.0.33/linux/fs/super.c linux/fs/super.c
@@ -972,12 +972,21 @@
 
 #ifdef CONFIG_BLK_DEV_FD
 	if (MAJOR(ROOT_DEV) == FLOPPY_MAJOR) {
+		extern int rd_doload;
 		floppy_eject();
 #ifndef CONFIG_BLK_DEV_RAM
 		printk(KERN_NOTICE "(Warning, this kernel has no ramdisk support)\n");
 #endif
-		printk(KERN_NOTICE "VFS: Insert root floppy and press ENTER\n");
-		wait_for_keypress();
+#ifdef CONFIG_BLK_DEV_INITRD
+		/* rd_doload is 2 for a dual initrd/ramload setup */
+		if(rd_doload==2)
+			rd_load_secondary();
+		else
+#endif		
+		{
+			printk(KERN_NOTICE "VFS: Insert root floppy and press ENTER\n");
+			wait_for_keypress();
+		}
 	}
 #endif