From 99ad26236e880f4d11cfe45e8234d05fec09363e Mon Sep 17 00:00:00 2001
From: Jacques de Laval <jacques@de-laval.se>
Date: Sat, 20 Feb 2021 12:39:29 +0100
Subject: [PATCH] test: Fix unshare/nsenter not in PATH

Signed-off-by: Jacques de Laval <jacques@de-laval.se>
---
 test/testenv_exec.sh  | 4 +++-
 test/testenv_start.sh | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/testenv_exec.sh b/test/testenv_exec.sh
index 8c4b11bb..f2929d48 100755
--- a/test/testenv_exec.sh
+++ b/test/testenv_exec.sh
@@ -13,8 +13,10 @@ shift
 TEST_DIR=$(dirname "$0")
 TESTS_ROOT="$(pwd)/${TEST_DIR}/test_root"
 
+nsenter=$(which nsenter)
+
 export PATH=/sbin:/bin
-nsenter \
+"$nsenter" \
     --preserve-credentials \
     --user \
     --mount \
diff --git a/test/testenv_start.sh b/test/testenv_start.sh
index a0bb8646..3281d5b7 100755
--- a/test/testenv_start.sh
+++ b/test/testenv_start.sh
@@ -7,10 +7,12 @@ TESTS_ROOT="$(pwd)/${TEST_DIR}/test_root"
 
 >&2 echo "Hint: Execute '${TEST_DIR}/testenv_exec.sh \$(pgrep -P $$) /bin/sh; reset' to enter the test namespace"
 
+unshare=$(which unshare)
+
 # Not supported by Busybox unshare:
 #  --cgroup --time
 export PATH=/sbin:/bin
-exec unshare \
+exec "$unshare" \
     --user --map-root-user \
     --fork --pid --mount-proc \
     --mount \