From: Luca Boccassi Date: Tue, 8 Apr 2025 19:32:32 +0000 (+0100) Subject: mkosi: drop os-release symlink for minimal-base image X-Git-Tag: v258-rc1~859 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e5f792193c1bda2684436a46dca45ed487d4f49;p=thirdparty%2Fsystemd.git mkosi: drop os-release symlink for minimal-base image [ 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 --- 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 index c4c75b419cf..00000000000 --- a/mkosi/mkosi.images/minimal-base/mkosi.extra/etc/os-release +++ /dev/null @@ -1 +0,0 @@ -../usr/lib/os-release \ No newline at end of file diff --git a/mkosi/mkosi.images/minimal-base/mkosi.postinst b/mkosi/mkosi.images/minimal-base/mkosi.postinst index c76fb0a011f..777bdfd449e 100755 --- a/mkosi/mkosi.images/minimal-base/mkosi.postinst +++ b/mkosi/mkosi.images/minimal-base/mkosi.postinst @@ -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