From aac5fbff0b03e85ea156cf0bd821bd90c1b89096 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 19 Jan 2021 17:23:57 +0000 Subject: [PATCH] sysext: install in rootbindir, remove template from unit This reverts commit 71ad75f30641b90f9ca0088869f164d9d085430f. --- meson.build | 2 +- units/meson.build | 2 +- units/{systemd-sysext.service.in => systemd-sysext.service} | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename units/{systemd-sysext.service.in => systemd-sysext.service} (90%) diff --git a/meson.build b/meson.build index 14b919d0c9..9b47e6ad03 100644 --- a/meson.build +++ b/meson.build @@ -2212,7 +2212,7 @@ if conf.get('ENABLE_SYSEXT') == 1 link_with : [libshared], install_rpath : rootlibexecdir, install : true, - install_dir : rootlibexecdir) + install_dir : rootbindir) endif if conf.get('ENABLE_USERDB') == 1 diff --git a/units/meson.build b/units/meson.build index bdfb2e52ce..0d0eeea753 100644 --- a/units/meson.build +++ b/units/meson.build @@ -133,6 +133,7 @@ units = [ ['systemd-poweroff.service', ''], ['systemd-reboot.service', ''], ['systemd-rfkill.socket', 'ENABLE_RFKILL'], + ['systemd-sysext.service', 'ENABLE_SYSEXT'], ['systemd-sysusers.service', 'ENABLE_SYSUSERS', 'sysinit.target.wants/'], ['systemd-tmpfiles-clean.service', 'ENABLE_TMPFILES'], @@ -211,7 +212,6 @@ in_units = [ ['systemd-oomd.service', 'ENABLE_OOMD'], ['systemd-portabled.service', 'ENABLE_PORTABLED', 'dbus-org.freedesktop.portable1.service'], - ['systemd-sysext.service', 'ENABLE_SYSEXT'], ['systemd-userdbd.service', 'ENABLE_USERDB'], ['systemd-homed.service', 'ENABLE_HOMED'], ['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'], diff --git a/units/systemd-sysext.service.in b/units/systemd-sysext.service similarity index 90% rename from units/systemd-sysext.service.in rename to units/systemd-sysext.service index aee30cc4b5..cc31f9ca9b 100644 --- a/units/systemd-sysext.service.in +++ b/units/systemd-sysext.service @@ -24,8 +24,8 @@ ConditionDirectoryNotEmpty=|/usr/lib/extensions [Service] Type=oneshot RemainAfterExit=yes -ExecStart=@rootlibexecdir@/systemd-sysext --merge -ExecStop=@rootlibexecdir@/systemd-sysext --unmerge +ExecStart=systemd-sysext --merge +ExecStop=systemd-sysext --unmerge [Install] WantedBy=sysinit.target -- 2.25.1