1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- a/init/do_mounts.c 2015-08-19 10:27:16.753852576 -0400
+++ b/init/do_mounts.c 2015-08-19 10:34:25.473850353 -0400
@@ -490,7 +490,11 @@ 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);
@@ -534,11 +538,17 @@ void __init mount_root(void)
#endif
#ifdef CONFIG_BLOCK
{
- int err = create_dev("/dev/root", ROOT_DEV);
-
- if (err < 0)
- pr_emerg("Failed to create /dev/root: %d\n", err);
- mount_block_root("/dev/root", root_mountflags);
+ if (saved_root_name[0] == '/') {
+ int err = create_dev(saved_root_name, ROOT_DEV);
+ if (err < 0)
+ pr_emerg("Failed to create %s: %d\n", saved_root_name, err);
+ mount_block_root(saved_root_name, root_mountflags);
+ } else {
+ int err = create_dev("/dev/root", ROOT_DEV);
+ if (err < 0)
+ pr_emerg("Failed to create /dev/root: %d\n", err);
+ mount_block_root("/dev/root", root_mountflags);
+ }
}
#endif
}
|