diff options
author | Eric Andersen <andersen@codepoet.org> | 2003-06-20 09:36:49 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2003-06-20 09:36:49 +0000 |
commit | 9d7f0f0fe86be9228db02e672ff5f0b2b4abfff9 (patch) | |
tree | 20549dff65fc0a4dc34482b77229f48ae4a80f2d /util-linux/mount.c | |
parent | dd92c77bb0de724cfc06feed5c716f936196ff63 (diff) | |
download | busybox-w32-9d7f0f0fe86be9228db02e672ff5f0b2b4abfff9.tar.gz busybox-w32-9d7f0f0fe86be9228db02e672ff5f0b2b4abfff9.tar.bz2 busybox-w32-9d7f0f0fe86be9228db02e672ff5f0b2b4abfff9.zip |
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/mount.c')
-rw-r--r-- | util-linux/mount.c | 4 |
1 files changed, 3 insertions, 1 deletions
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) | |||
334 | while ((m = getmntent(mountTable)) != 0) { | 334 | while ((m = getmntent(mountTable)) != 0) { |
335 | char *blockDevice = m->mnt_fsname; | 335 | char *blockDevice = m->mnt_fsname; |
336 | 336 | ||
337 | if (strcmp(blockDevice, "/dev/root") == 0) { | 337 | if (strcmp(blockDevice, "rootfs") == 0) { |
338 | continue; | ||
339 | } else if (strcmp(blockDevice, "/dev/root") == 0) { | ||
338 | blockDevice = find_real_root_device_name(blockDevice); | 340 | blockDevice = find_real_root_device_name(blockDevice); |
339 | } | 341 | } |
340 | if (!onlytype || (strcmp(m->mnt_type, onlytype) == 0)) { | 342 | if (!onlytype || (strcmp(m->mnt_type, onlytype) == 0)) { |