From 566f1000d1850e821026dc4ed77e7701b20162a1 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Fri, 8 Dec 2023 18:47:04 +0000 Subject: 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. --- mkosi.images/base/mkosi.build.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkosi.images/base') diff --git a/mkosi.images/base/mkosi.build.chroot b/mkosi.images/base/mkosi.build.chroot index f26098cedf..b60ed8d731 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" -- cgit v1.2.3