[PATCH] init: fix name of root device in /proc/mounts

[PATCH] init: fix name of root device in /proc/mounts

[William Hubbs]

On a system that does not use an initramfs, /dev/root is always
listed in /proc/mounts. This breaks software which scans /proc/mounts to
determine which file systems are mounted since /dev/root is not a valid
device name.

This changes that processing so that "/dev/root" is only added to
/proc/mounts if a root device is not specified with the root= option on
the kernel command line.

Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
---
 init/do_mounts.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 1d1b634..efc37d2 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -480,7 +480,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);
@@ -523,8 +526,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
 }
 
-- 
1.7.12.4

Re: [PATCH] init: fix name of root device in /proc/mounts

[William Hubbs]

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

All,

this patch was originally sent to linux-kernel, but I was told it might
be better to send it to this list since this section of the kernel does
not have a specific maintainer.

Thanks,

William

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] init: fix name of root device in /proc/mounts

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

Hi William,

On Tue, 5 Feb 2013 14:10:35 -0600 William Hubbs <w.d.hubbs@gmail.com> wrote:
>
> this patch was originally sent to linux-kernel, but I was told it might
> be better to send it to this list since this section of the kernel does
> not have a specific maintainer.

You were misinformed.  The linux-next list is for discussion of things
about the linux-next releases and not for general development.
linux-kernel was the right place.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] init: fix name of root device in /proc/mounts

[William Hubbs]

[-- Attachment #1: Type: text/plain, Size: 653 bytes --]

On Wed, Feb 06, 2013 at 08:45:46AM +1100, Stephen Rothwell wrote:
> Hi William,
> 
> On Tue, 5 Feb 2013 14:10:35 -0600 William Hubbs <w.d.hubbs@gmail.com> wrote:
> >
> > this patch was originally sent to linux-kernel, but I was told it might
> > be better to send it to this list since this section of the kernel does
> > not have a specific maintainer.
> 
> You were misinformed.  The linux-next list is for discussion of things
> about the linux-next releases and not for general development.
> linux-kernel was the right place.

Ok, no problem, I'll just wait for responses from there. Sorry about the
noise on this list.

William


[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]