mirror of
https://github.com/troglobit/finit.git
synced 2026-10-01 05:22:48 +07:00
test: Fix chroot not in PATH
Signed-off-by: Jacques de Laval <jacques@de-laval.se>
This commit is contained in:
+3
-1
@@ -41,7 +41,9 @@ teardown() {
|
||||
wait
|
||||
}
|
||||
|
||||
TEST_DIR=$(dirname "$1")
|
||||
TEST="$1"
|
||||
TEST_DIR=$(dirname "$TEST")
|
||||
shift
|
||||
|
||||
trap teardown EXIT
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ TEST_DIR=$(dirname "$0")
|
||||
TESTS_ROOT="$(pwd)/${TEST_DIR}/test_root"
|
||||
|
||||
nsenter=$(which nsenter)
|
||||
chroot=$(which chroot)
|
||||
|
||||
export PATH=/sbin:/bin
|
||||
"$nsenter" \
|
||||
@@ -25,4 +26,4 @@ export PATH=/sbin:/bin
|
||||
--net \
|
||||
--pid \
|
||||
-w -t "$target" \
|
||||
chroot "$TESTS_ROOT" "$@"
|
||||
"$chroot" "$TESTS_ROOT" "$@"
|
||||
|
||||
@@ -8,6 +8,7 @@ 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)
|
||||
chroot=$(which chroot)
|
||||
|
||||
# Not supported by Busybox unshare:
|
||||
# --cgroup --time
|
||||
@@ -18,4 +19,4 @@ exec "$unshare" \
|
||||
--mount \
|
||||
--mount-proc \
|
||||
--uts --ipc --net \
|
||||
chroot "$TESTS_ROOT" /bin/chrootsetup.sh "$@"
|
||||
"$chroot" "$TESTS_ROOT" /bin/chrootsetup.sh "$@"
|
||||
|
||||
Reference in New Issue
Block a user