From: Darrick J. Wong <djwong@xxxxxxxxxx>
Make sure the installed unshare binary supports all the arguments that
it wants to use. The unshare program on my system (Ubuntu 22.04)
doesn't support --map-auto, so this test fails unnecessarily.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
common/rc | 2 +-
tests/btrfs/300 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/rc b/common/rc
index 41862c2766..722e3bdcaa 100644
--- a/common/rc
+++ b/common/rc
@@ -5333,7 +5333,7 @@ _soak_loop_running() {
_require_unshare() {
unshare -f -r -m -p -U $@ true &>/dev/null || \
- _notrun "unshare: command not found, should be in util-linux"
+ _notrun "unshare $*: command not found, should be in util-linux"
}
# Return a random file in a directory. A directory is *not* followed
diff --git a/tests/btrfs/300 b/tests/btrfs/300
index ff87ee7112..8a0eaecf87 100755
--- a/tests/btrfs/300
+++ b/tests/btrfs/300
@@ -20,7 +20,7 @@ _require_test
_require_user
_require_group
_require_unix_perm_checking
-_require_unshare
+_require_unshare --keep-caps --map-auto --map-root-user
test_dir="${TEST_DIR}/${seq}"
cleanup() {
