emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

df: do "rootfs" check sooner

Browse Source 
function                                             old     new   delta
df_main                                             1065    1064      -1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-02-23 17:08:32 +01:00
parent 58cd6e1ade
commit e20a703fd3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
coreutils/df.c
View File

@ -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,