From 047d5b6a321bfa325f42b1f516aaec0909141a06 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Tue, 13 Feb 2024 12:50:58 +0000 Subject: [PATCH] TEST-13-NSPAWN: move container template to /usr/share Having directories in / causes problems for make-root-on-boot images --- test/TEST-13-NSPAWN/test.sh | 2 +- test/units/util.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/TEST-13-NSPAWN/test.sh b/test/TEST-13-NSPAWN/test.sh index 6dfb5277183..915f2db86bc 100755 --- a/test/TEST-13-NSPAWN/test.sh +++ b/test/TEST-13-NSPAWN/test.sh @@ -11,7 +11,7 @@ TEST_NO_NSPAWN=1 test_append_files() { local workspace="${1:?}" - local container="$workspace/testsuite-13-container-template" + local container="$workspace/usr/share/testsuite-13-container-template" # For virtual wlan interface. instmods mac80211_hwsim diff --git a/test/units/util.sh b/test/units/util.sh index 8eea263135b..619cb8ebbfd 100755 --- a/test/units/util.sh +++ b/test/units/util.sh @@ -156,13 +156,13 @@ coverage_create_nspawn_dropin() { create_dummy_container() { local root="${1:?}" - if [[ ! -d /testsuite-13-container-template ]]; then + if [[ ! -d /usr/share/testsuite-13-container-template ]]; then echo >&2 "Missing container template, probably not running in TEST-13-NSPAWN?" exit 1 fi mkdir -p "$root" - cp -a /testsuite-13-container-template/* "$root" + cp -a /usr/share/testsuite-13-container-template/* "$root" coverage_create_nspawn_dropin "$root" } -- 2.47.3