From 9d7f0f0fe86be9228db02e672ff5f0b2b4abfff9 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 20 Jun 2003 09:36:49 +0000 Subject: Somewhere in the 2.4.x kernel series, /proc/mounts was changed to display a "rootfs" entry as well as the traditional "/dev/root" entry. This caused applets such as mount and df to display two root filesystem entries.... This teaches the relevant utilities to ignore the "rootfs" entry. -Erik --- util-linux/mount.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'util-linux/mount.c') diff --git a/util-linux/mount.c b/util-linux/mount.c index d02005600..49d086c97 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -334,7 +334,9 @@ static void show_mounts(char *onlytype) while ((m = getmntent(mountTable)) != 0) { char *blockDevice = m->mnt_fsname; - if (strcmp(blockDevice, "/dev/root") == 0) { + if (strcmp(blockDevice, "rootfs") == 0) { + continue; + } else if (strcmp(blockDevice, "/dev/root") == 0) { blockDevice = find_real_root_device_name(blockDevice); } if (!onlytype || (strcmp(m->mnt_type, onlytype) == 0)) { -- cgit v1.2.3-55-g6feb