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 /coreutils/df.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 'coreutils/df.c')
| -rw-r--r-- | coreutils/df.c | 4 |
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) | |||
| 126 | ) / (blocks_used + s.f_bavail); | 126 | ) / (blocks_used + s.f_bavail); |
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | if (strcmp(device, "/dev/root") == 0) { | 129 | if (strcmp(device, "rootfs") == 0) { |
| 130 | continue; | ||
| 131 | } else if (strcmp(device, "/dev/root") == 0) { | ||
| 130 | /* Adjusts device to be the real root device, | 132 | /* Adjusts device to be the real root device, |
| 131 | * or leaves device alone if it can't find it */ | 133 | * or leaves device alone if it can't find it */ |
| 132 | if ((device = find_real_root_device_name(device)) == NULL) { | 134 | if ((device = find_real_root_device_name(device)) == NULL) { |