system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-02 22:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

TEST-13-NSPAWN: move container template to /usr/share

Browse source 
Having directories in / causes problems for make-root-on-boot images
This commit is contained in:
Richard Maw 2024-02-13 12:50:58 +00:00 committed by Daan De Meyer
parent b81ece59c4
commit 047d5b6a32
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/TEST-13-NSPAWN/test.sh
View file

@ -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

4
test/units/util.sh
View file

@ -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"
}