shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-08 21:17:47 +03:00
Code

sysext: install in rootbindir, remove template from unit

Browse Source 
This reverts commit 71ad75f306.
This commit is contained in:
Luca Boccassi 2021-01-19 17:23:57 +00:00 committed by Zbigniew Jędrzejewski-Szmek
parent 23afa884d4
commit aac5fbff0b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -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

2
units/meson.build
View File

@ -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'],

4
units/systemd-sysext.service.in → units/systemd-sysext.service
View File

@ -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