From: Luca Boccassi Date: Fri, 18 Oct 2024 14:02:03 +0000 (+0100) Subject: test: customize /etc/os-release instead of /usr/lib/os-release X-Git-Tag: v257-rc1~185 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f6fe4e1131d39fcafa9e00a7902919efb5361e1;p=thirdparty%2Fsystemd.git test: customize /etc/os-release instead of /usr/lib/os-release As per spec image builders can create a local /etc/os-release with per-image IDs, so modify that one instead of the original one in /usr/lib. For example we do this when we build debian unstable images in mkosi. --- diff --git a/test/units/TEST-82-SOFTREBOOT.sh b/test/units/TEST-82-SOFTREBOOT.sh index 57c6431ffc4..9f76c862454 100755 --- 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)