From 7bbdddeedb74b20e1da84022b6ab5f17bbc00517 Mon Sep 17 00:00:00 2001 From: Kai Germaschewski Date: Fri, 21 Feb 2003 12:44:34 -0600 Subject: do_mounts: Simplify logic for ramdisk from floppy. Currently, we would try to read in a ramdisk image from floppy, if o root device is /dev/fd* o "load_ramdisk=1" on the command line o CONFIG_BLK_DEV_INITRD is not set, or "noinitrd" on the command line. Relax the last restriction, which only makes things more complicated for no reason, and changes behavior depending on an unrelated config option. --- init/do_mounts.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'init') diff --git a/init/do_mounts.c b/init/do_mounts.c index 96b1594e5591..f6a33159b980 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -731,8 +731,10 @@ void __init prepare_namespace(void) if (mount_initrd) { if (initrd_load()) goto out; - } else if (is_floppy && rd_doload && rd_load_disk(0)) + } + if (is_floppy && rd_doload && rd_load_disk(0)) ROOT_DEV = Root_RAM0; + mount_root(); out: umount_devfs("/dev"); -- cgit v1.2.3