sysext: install in /usr/lib/systemd/ for now

This is a brand new binary, and the CI packaging doesn't pick it up,
causing the upstream testrun to fail (sysext is pulled in by the unit).
This commit is contained in:
Luca Boccassi 2021-01-18 16:07:12 +00:00 committed by Lennart Poettering
parent a1fd722b5d
commit 71ad75f306
2 changed files with 3 additions and 3 deletions

View file

@ -2212,7 +2212,7 @@ if conf.get('ENABLE_SYSEXT') == 1
link_with : [libshared], link_with : [libshared],
install_rpath : rootlibexecdir, install_rpath : rootlibexecdir,
install : true, install : true,
install_dir : rootbindir) install_dir : rootlibexecdir)
endif endif
if conf.get('ENABLE_USERDB') == 1 if conf.get('ENABLE_USERDB') == 1

View file

@ -24,8 +24,8 @@ ConditionDirectoryNotEmpty=|/usr/lib/extensions
[Service] [Service]
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=@rootbindir@/systemd-sysext --merge ExecStart=@rootlibexecdir@/systemd-sysext --merge
ExecStop=@rootbindir@/systemd-sysext --unmerge ExecStop=@rootlibexecdir@/systemd-sysext --unmerge
[Install] [Install]
WantedBy=sysinit.target WantedBy=sysinit.target