diff options
author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 19:20:44 +0000 |
---|---|---|
committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 19:20:44 +0000 |
commit | 7cec36c2876610cbfb5a8238b107ed0de479f978 (patch) | |
tree | b237d6222e5beb8049ffd77850037281edbde353 /system/coreutils/test-df-symlink-bindmount.patch | |
parent | 551b3650fcb5c065ca18f99fe8f2318ecad0209c (diff) | |
parent | 48545ebadf2369ca84622698234df68b8b36dba6 (diff) | |
download | packages-7cec36c2876610cbfb5a8238b107ed0de479f978.tar.gz packages-7cec36c2876610cbfb5a8238b107ed0de479f978.tar.bz2 packages-7cec36c2876610cbfb5a8238b107ed0de479f978.tar.xz packages-7cec36c2876610cbfb5a8238b107ed0de479f978.zip |
Merge branch 'auto-system' into 'master'
Fixes for auto-building system/, part one
See merge request adelie/packages!339
Diffstat (limited to 'system/coreutils/test-df-symlink-bindmount.patch')
-rw-r--r-- | system/coreutils/test-df-symlink-bindmount.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/system/coreutils/test-df-symlink-bindmount.patch b/system/coreutils/test-df-symlink-bindmount.patch new file mode 100644 index 000000000..34b334ba8 --- /dev/null +++ b/system/coreutils/test-df-symlink-bindmount.patch @@ -0,0 +1,11 @@ +--- coreutils-8.31/tests/df/df-symlink.sh 2019-01-05 05:36:22.000000000 -0500 ++++ coreutils-8.31/tests/df/df-symlink.sh 2019-05-30 23:57:10.260506897 -0400 +@@ -34,7 +34,7 @@ + # I.e., '.' => /dev/mapper/fedora-home -> /dev/dm-2 + # Restrict this test to systems with a 1:1 mapping between + # source and target. This excludes for example BTRFS sub-volumes. +-if test "$(df --output=source | grep -F "$disk" | wc -l)" = 1; then ++if test "$(df --all --output=source | grep -F "$disk" | wc -l)" = 1; then + df --out=source,target '.' > out || fail=1 + compare exp out || fail=1 + fi |