From: Richard Maw <richard.maw@codethink.co.uk>
Date: Fri, 8 Dec 2023 18:47:04 +0000 (+0000)
Subject: mkosi: make sysvinit path inference consistent
X-Git-Tag: v256-rc1~1467^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F30464%2Fhead;p=thirdparty%2Fsystemd.git

mkosi: make sysvinit path inference consistent

The integration tests use /etc/rc.d/init.d if it exists
or falls back to /etc/init.d,
while the mkosi.build.chroot script dereferenced /etc/init.d.

This produces inconsistent results, as sometimes an image can be made
that has systemd built to expect /etc/init.d but /etc/rc.d/init.d
also exists.
---

diff --git a/mkosi.images/base/mkosi.build.chroot b/mkosi.images/base/mkosi.build.chroot
index f26098cedf5..b60ed8d7312 100755
--- a/mkosi.images/base/mkosi.build.chroot
+++ b/mkosi.images/base/mkosi.build.chroot
@@ -44,7 +44,7 @@ EOF
 fi
 
 if [ ! -f "$BUILDDIR"/build.ninja ]; then
-    sysvinit_path=$(realpath /etc/init.d)
+    [[ -d /etc/rc.d/init.d ]] && sysvinit_path="/etc/rc.d/init.d" || sysvinit_path="/etc/init.d"
 
     if [ "$ID" = "centos" ] && [ "$VERSION" = "8" ]; then
         UKIFY="disabled"