diff options
| author | Luca Boccassi <luca.boccassi@gmail.com> | 2024-10-18 16:02:03 +0200 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2024-10-18 18:03:16 +0200 |
| commit | 2f6fe4e1131d39fcafa9e00a7902919efb5361e1 (patch) | |
| tree | be260a7f4a6b46f35823a47bd64a7ed9221d46f5 | |
| parent | resolved: refresh resolv.conf files when link goes away (diff) | |
| download | systemd-2f6fe4e1131d39fcafa9e00a7902919efb5361e1.tar.xz systemd-2f6fe4e1131d39fcafa9e00a7902919efb5361e1.zip | |
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.
| -rwxr-xr-x | test/units/TEST-82-SOFTREBOOT.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/units/TEST-82-SOFTREBOOT.sh b/test/units/TEST-82-SOFTREBOOT.sh index 57c6431ffc..9f76c86245 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) |