diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2015-03-28 16:02:50 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2015-03-28 16:02:50 -0400 |
| commit | 97608c66db0b4ea264f5fc4a6516f124d71da412 (patch) | |
| tree | 2d0a156cae2cdec09cbed1413ed9655760e0a318 | |
| parent | Linux patch 3.10.73 (diff) | |
| download | linux-patches-97608c66db0b4ea264f5fc4a6516f124d71da412.tar.gz linux-patches-97608c66db0b4ea264f5fc4a6516f124d71da412.tar.bz2 linux-patches-97608c66db0b4ea264f5fc4a6516f124d71da412.zip | |
Add check to saved_root_name for supported filesystem path naming.
| -rw-r--r-- | 2900_dev-root-proc-mount-fix.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/2900_dev-root-proc-mount-fix.patch b/2900_dev-root-proc-mount-fix.patch index 4c89adfe..4a7e42ac 100644 --- a/2900_dev-root-proc-mount-fix.patch +++ b/2900_dev-root-proc-mount-fix.patch @@ -1,6 +1,6 @@ ---- a/init/do_mounts.c 2013-01-25 19:11:11.609802424 -0500 -+++ b/init/do_mounts.c 2013-01-25 19:14:20.606053568 -0500 -@@ -461,7 +461,10 @@ void __init change_floppy(char *fmt, ... +--- a/init/do_mounts.c 2015-03-28 16:00:36.114842442 -0400 ++++ b/init/do_mounts.c 2015-03-28 16:01:57.768841663 -0400 +@@ -480,7 +480,10 @@ void __init change_floppy(char *fmt, ... va_start(args, fmt); vsprintf(buf, fmt, args); va_end(args); @@ -12,12 +12,12 @@ if (fd >= 0) { sys_ioctl(fd, FDEJECT, 0); sys_close(fd); -@@ -505,7 +508,13 @@ void __init mount_root(void) +@@ -524,7 +527,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]) { ++ if (saved_root_name[0] == '/') { + create_dev(saved_root_name, ROOT_DEV); + mount_block_root(saved_root_name, root_mountflags); + } else { |