e20a703fd
Denys Vlasenko
2018-02-23
Subject
df: do "rootfs" check sooner
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/df.c+5 -4
| @@ -206,6 +206,11 @@ int df_main(int argc UNUSED_PARAM, char **argv) | |
| } | |
| device = mount_entry->mnt_fsname; | |
| + | |
| + | /* GNU coreutils 6.10 skips certain mounts, try to be compatible */ |
| + | if (ENABLE_FEATURE_SKIP_ROOTFS && strcmp(device, "rootfs") == 0) |
| + | continue; |
| + | |
| mount_point = mount_entry->mnt_dir; | |
| fs_type = mount_entry->mnt_type; | |
| @@ -245,10 +250,6 @@ int df_main(int argc UNUSED_PARAM, char **argv) | |
| blocks_percent_used = u / (unsigned)blocks_total; | |
| } | |
| - | /* GNU coreutils 6.10 skips certain mounts, try to be compatible. */ |
| - | if (ENABLE_FEATURE_SKIP_ROOTFS && strcmp(device, "rootfs") == 0) |
| - | continue; |
| - | |
| #ifdef WHY_WE_DO_IT_FOR_DEV_ROOT_ONLY | |
| if (strcmp(device, "/dev/root") == 0) { | |
| /* Adjusts device to be the real root device, | |