diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2023-12-08 19:47:04 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2023-12-14 17:26:23 +0100 |
| commit | 566f1000d1850e821026dc4ed77e7701b20162a1 (patch) | |
| tree | 9e668749954846afb10726a9d1784b2febca552f /mkosi.images/base/mkosi.build.chroot | |
| parent | mkosi: Install locales in fedora (diff) | |
| download | systemd-566f1000d1850e821026dc4ed77e7701b20162a1.tar.xz systemd-566f1000d1850e821026dc4ed77e7701b20162a1.zip | |
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.
Diffstat (limited to '')
| -rwxr-xr-x | mkosi.images/base/mkosi.build.chroot | 2 |
1 files changed, 1 insertions, 1 deletions
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" |