aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-06-20 09:36:49 +0000
committerEric Andersen <andersen@codepoet.org>2003-06-20 09:36:49 +0000
commit9d7f0f0fe86be9228db02e672ff5f0b2b4abfff9 (patch)
tree20549dff65fc0a4dc34482b77229f48ae4a80f2d /coreutils
parentdd92c77bb0de724cfc06feed5c716f936196ff63 (diff)
downloadbusybox-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 'coreutils')
-rw-r--r--coreutils/df.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/coreutils/df.c b/coreutils/df.c
index 9673633cc..543527ea4 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -126,7 +126,9 @@ extern int df_main(int argc, char **argv)
) / (blocks_used + s.f_bavail);
}
- if (strcmp(device, "/dev/root") == 0) {
+ if (strcmp(device, "rootfs") == 0) {
+ continue;
+ } else if (strcmp(device, "/dev/root") == 0) {
/* Adjusts device to be the real root device,
* or leaves device alone if it can't find it */
if ((device = find_real_root_device_name(device)) == NULL) {