]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: drop os-release symlink for minimal-base image
authorLuca Boccassi <luca.boccassi@gmail.com>
Tue, 8 Apr 2025 19:32:32 +0000 (20:32 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Wed, 9 Apr 2025 14:19:18 +0000 (15:19 +0100)
[  385s] ERROR: link target doesn't exist (neither in build root nor in installed system):
[  385s]   /usr/lib/systemd/tests/mkosi/mkosi.images/minimal-base/mkosi.extra/etc/os-release -> ../usr/lib/os-release

It shouldn't be even needed, everything should look in /usr/lib/os-release too

Follow-up for a0ce5e642ff4fcfcd7da25a585bfbd83b5737235

mkosi/mkosi.images/minimal-base/mkosi.extra/etc/os-release [deleted symlink]
mkosi/mkosi.images/minimal-base/mkosi.postinst

diff --git a/mkosi/mkosi.images/minimal-base/mkosi.extra/etc/os-release b/mkosi/mkosi.images/minimal-base/mkosi.extra/etc/os-release
deleted file mode 120000 (symlink)
index c4c75b4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../usr/lib/os-release
\ No newline at end of file
index c76fb0a011f0c32d4e4a8393fbd7cb973ee74635..777bdfd449e52c623b99e49e620cea0dfcedd0ca 100755 (executable)
@@ -9,3 +9,8 @@ echo "Hello from dummy init, beautiful day, innit?"
 ip link
 EOF
 chmod +x "$BUILDROOT/sbin/init"
+
+# Arch relies on tmpfiles.d/etc.conf but this image isn't booted
+if [ ! -e "$BUILDROOT/etc/os-release" ]; then
+    ln -s ../usr/lib/os-release "$BUILDROOT/etc/os-release"
+fi