| 12345678910111213141516171819202122232425262728293031 |
- --- a/init/do_mounts.c 2014-08-26 08:03:30.000013100 -0400
- +++ b/init/do_mounts.c 2014-08-26 08:11:19.720014712 -0400
- @@ -484,7 +484,10 @@ void __init change_floppy(char *fmt, ...
- va_start(args, fmt);
- vsprintf(buf, fmt, args);
- va_end(args);
- - fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
- + if (saved_root_name[0])
- + fd = sys_open(saved_root_name, O_RDWR | O_NDELAY, 0);
- + else
- + fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
- if (fd >= 0) {
- sys_ioctl(fd, FDEJECT, 0);
- sys_close(fd);
- @@ -527,8 +530,13 @@ void __init mount_root(void)
- }
- #endif
- #ifdef CONFIG_BLOCK
- - create_dev("/dev/root", ROOT_DEV);
- - mount_block_root("/dev/root", root_mountflags);
- + if (saved_root_name[0]) {
- + create_dev(saved_root_name, ROOT_DEV);
- + mount_block_root(saved_root_name, root_mountflags);
- + } else {
- + create_dev("/dev/root", ROOT_DEV);
- + mount_block_root("/dev/root", root_mountflags);
- + }
- #endif
- }
-
|
