diff options
| author | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2003-02-21 12:44:34 -0600 |
|---|---|---|
| committer | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2003-02-21 12:44:34 -0600 |
| commit | 7bbdddeedb74b20e1da84022b6ab5f17bbc00517 (patch) | |
| tree | f3db9676f80a3b7b8866ad7d16b9afbd37851aa5 /init | |
| parent | 3807a041569c74f3985c3fdb5b5d6f08fbc17ce5 (diff) | |
| download | history-7bbdddeedb74b20e1da84022b6ab5f17bbc00517.tar.gz | |
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.
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 96b1594e5591f5..f6a33159b9802f 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"); |