test-customize-etc-os-release-instead-of-usr-lib-os-relea

Author Luca Boccassi <luca.boccassi@gmail.com>
Description: test: customize /etc/os-release instead of /usr/lib/os-release
Origin: upstream, commit:2f6fe4e1131d39fcafa9e00a7902919efb5361e1

Gbp-Pq: Name test-customize-etc-os-release-instead-of-usr-lib-os-relea.patch

diff --git a/test/units/TEST-82-SOFTREBOOT.sh b/test/units/TEST-82-SOFTREBOOT.sh
index 9f3d4066c3aa7e08ce052c11d52195714c8f3fea..bf3cfb5276dbf212c67b9f488212b7b1703aa627 100755 (executable)
--- a/test/units/TEST-82-SOFTREBOOT.sh
+++ b/test/units/TEST-82-SOFTREBOOT.sh
@@ -157,9 +157,9 @@ elif [ -f /run/TEST-82-SOFTREBOOT.touch ]; then
 
     # Copy os-release away, so that we can manipulate it and check that it is updated in the propagate
     # directory across soft reboots. Try to cover corner cases by truncating it.
-    mkdir -p /tmp/nextroot-lower/usr/lib
-    grep ID /etc/os-release >/tmp/nextroot-lower/usr/lib/os-release
-    echo MARKER=1 >>/tmp/nextroot-lower/usr/lib/os-release
+    mkdir -p /tmp/nextroot-lower/etc
+    grep ID /etc/os-release >/tmp/nextroot-lower/etc/os-release
+    echo MARKER=1 >>/tmp/nextroot-lower/etc/os-release
     cmp /etc/os-release /run/systemd/propagate/.os-release-stage/os-release
     (! grep -q MARKER=1 /etc/os-release)