diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-10-25 20:42:38 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-11-10 19:00:06 +0100 |
| commit | 8da0592c5db5a1b9a8306433256ca80915a34043 (patch) | |
| tree | f7723a91285f725e5012c2fccc087b758dd29492 /mkosi.build | |
| parent | f33a319f9924196555084452f30c5ed4c0799f24 (diff) | |
| download | systemd-8da0592c5db5a1b9a8306433256ca80915a34043.tar.gz | |
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.
Diffstat (limited to 'mkosi.build')
| -rwxr-xr-x | mkosi.build | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkosi.build b/mkosi.build index 456217fa5d..71251920ed 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 |