Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP5:GA
coreutils.669
coreutils-ignore_non_file_system_entries_in_pro...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File coreutils-ignore_non_file_system_entries_in_proc_mounts.patch of Package coreutils.669
commit cbfb34c7d32e888b39e03a51a374ed664e9fa31b Author: Pádraig Brady <P@draigBrady.com> Date: Mon May 12 14:49:13 2014 +0100 df: ignore non file system entries in /proc/mounts Linux with network namespaces contains entries in /proc/mounts like: proc net:[4026532464] proc rw,nosuid,nodev,noexec,relatime 0 0 resulting in a failure to stat 'net:[...]', inducing a warning and an exit with failure status. * src/df.c (get_dev): Ignore all relative mount points. * tests/df/skip-duplicates.sh: Add an entry to test relative dirs. diff --git a/src/df.c b/src/df.c index 24897a3..a7fc57f 100644 --- a/src/df.c +++ b/src/df.c @@ -853,6 +853,11 @@ get_dev (char const *disk, char const *mount_point, char const* file, if (!selected_fstype (fstype) || excluded_fstype (fstype)) return; + /* Ignore relative MOUNT_POINTs, which are present for example + in /proc/mounts on Linux with network namespaces. */ + if (!force_fsu && mount_point && ! IS_ABSOLUTE_FILE_NAME (mount_point)) + return; + /* If MOUNT_POINT is NULL, then the file system is not mounted, and this program reports on the file system that the special file is on. It would be better to report on the unmounted file system, diff --git a/tests/df/skip-duplicates.sh b/tests/df/skip-duplicates.sh index d872f27..44f7d4c 100755 --- a/tests/df/skip-duplicates.sh +++ b/tests/df/skip-duplicates.sh @@ -56,6 +56,7 @@ struct mntent *getmntent (FILE *fp) {.mnt_fsname="/fsname", .mnt_dir="/"}, {.mnt_fsname="virtfs", .mnt_dir="/NONROOT"}, {.mnt_fsname="virtfs", .mnt_dir="/NONROOT"}, + {.mnt_fsname="netns", .mnt_dir="net:[1234567]"}, }; if (done == 1) @@ -68,7 +69,7 @@ struct mntent *getmntent (FILE *fp) if (done == 1 && !getenv ("CU_TEST_DUPE_INVALID")) done++; /* skip the first entry. */ - while (done++ <= 6) + while (done++ <= 7) { mntents[done-2].mnt_type = "-"; if (STREQ (mntents[done-2].mnt_dir, "/NONROOT"))
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor