File 0003-TEST-13-NSPAWN-fix-for-SLE15SP6.patch of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-TEST-13-NSPAWN-fix-for-SLE15SP6.patch of Package systemd

From cf83454c49d0265a79a171ca35754b8da43d5ead Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Tue, 30 Jan 2024 16:53:08 +0100
Subject: [PATCH 3/6] TEST-13-NSPAWN: fix for SLE15SP6

(cherry picked from commit 1b6892a11c4f899fbf2056a98cacea6b73df4bee)
---
 test/TEST-13-NSPAWN/test.sh       |  1 +
 test/units/testsuite-13.nspawn.sh | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/test/TEST-13-NSPAWN/test.sh b/test/TEST-13-NSPAWN/test.sh
index 2e94156432..edbb84f04a 100755
--- a/test/TEST-13-NSPAWN/test.sh
+++ b/test/TEST-13-NSPAWN/test.sh
@@ -33,6 +33,7 @@ test_append_files() {
         touch \
         true
 
+    [[ -d "$container/usr/lib/" ]] || mkdir "$container/usr/lib/"
     cp /etc/os-release "$container/usr/lib/os-release"
     cat >"$container/sbin/init" <<EOF
 #!/bin/bash
diff --git a/test/units/testsuite-13.nspawn.sh b/test/units/testsuite-13.nspawn.sh
index 8a6fa84dc9..b08f7e340f 100755
--- a/test/units/testsuite-13.nspawn.sh
+++ b/test/units/testsuite-13.nspawn.sh
@@ -116,17 +116,18 @@ testcase_sanity() {
 
     # --volatile=
     touch "$root/usr/has-usr"
+    echo "skipping 'volatile(=yes)' test on SLES since it requires usrmerge"
     # volatile(=yes): rootfs is tmpfs, /usr/ from the OS tree is mounted read only
-    systemd-nspawn --directory="$root"\
-                   --volatile \
-                   bash -xec 'test -e /usr/has-usr; touch /usr/read-only && exit 1; touch /nope'
-    test ! -e "$root/nope"
-    test ! -e "$root/usr/read-only"
-    systemd-nspawn --directory="$root"\
-                   --volatile=yes \
-                   bash -xec 'test -e /usr/has-usr; touch /usr/read-only && exit 1; touch /nope'
-    test ! -e "$root/nope"
-    test ! -e "$root/usr/read-only"
+#    systemd-nspawn --directory="$root"\
+#                   --volatile \
+#                   bash -xec 'test -e /usr/has-usr; touch /usr/read-only && exit 1; touch /nope'
+#    test ! -e "$root/nope"
+#    test ! -e "$root/usr/read-only"
+#    systemd-nspawn --directory="$root"\
+#                   --volatile=yes \
+#                   bash -xec 'test -e /usr/has-usr; touch /usr/read-only && exit 1; touch /nope'
+#    test ! -e "$root/nope"
+#    test ! -e "$root/usr/read-only"
     # volatile=state: rootfs is read-only, /var/ is tmpfs
     systemd-nspawn --directory="$root" \
                    --volatile=state \
-- 
2.43.0

Places

File 0003-TEST-13-NSPAWN-fix-for-SLE15SP6.patch of Package systemd

Places