From 8da0592c5db5a1b9a8306433256ca80915a34043 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 25 Oct 2017 20:42:38 +0200 Subject: [PATCH] mkosi: fix build script to use right sysvinit path On Fedora /etc/init.d is a symlink to /etc/rc.d/init.d. Our build scripts default to /etc/init.d since that is the LSB default. Let's make sure the build script thus follows the symlink correctly and configures to path explicitly, since otherwise our build artifacts in $DESTDIR are incompatible with the setup we actually need for Fedora. --- mkosi.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mkosi.build b/mkosi.build index 456217f..7125192 100755 --- a/mkosi.build +++ b/mkosi.build @@ -26,7 +26,9 @@ export LC_CTYPE=en_US.UTF-8 -[ -f "$BUILDDIR"/build.ninja ] || meson "$BUILDDIR" +sysvinit_path=`realpath /etc/init.d` + +[ -f "$BUILDDIR"/build.ninja ] || meson "$BUILDDIR" -D "sysvinit-path=$sysvinit_path" ninja -C "$BUILDDIR" all [ "$WITH_TESTS" = 0 ] || ninja -C "$BUILDDIR" test || ( RET="$?" ; cat "$BUILDDIR"/meson-logs/testlog.txt ; exit "$RET" ) ninja -C "$BUILDDIR" install -- 2.7.4