summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorEric Andersen2003-06-20 09:36:49 +0000
committerEric Andersen2003-06-20 09:36:49 +0000
commit9d7f0f0fe86be9228db02e672ff5f0b2b4abfff9 (patch)
tree20549dff65fc0a4dc34482b77229f48ae4a80f2d /util-linux
parentdd92c77bb0de724cfc06feed5c716f936196ff63 (diff)
downloadbusybox-9d7f0f0fe86be9228db02e672ff5f0b2b4abfff9.zip
busybox-9d7f0f0fe86be9228db02e672ff5f0b2b4abfff9.tar.gz
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
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/mount.c4
-rw-r--r--util-linux/umount.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index d020056..49d086c 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)) {
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 1d3e893..c11f2e9 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -111,7 +111,9 @@ static char *mtab_getinfo(const char *match, const char which)
return cur->mountpt;
} else {
#if !defined CONFIG_FEATURE_MTAB_SUPPORT
- if (strcmp(cur->device, "/dev/root") == 0) {
+ if (strcmp(cur->device, "rootfs") == 0) {
+ continue;
+ } else if (strcmp(cur->device, "/dev/root") == 0) {
/* Adjusts device to be the real root device,
* or leaves device alone if it can't find it */
cur->device = find_real_root_device_name(cur->device);