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).

diff --git a/meson.build b/meson.build
index 9b47e6ad03376261a4cbad63ee985a00fd1d6a83..14b919d0c9f671f49e4d0f971eb3d36567a82254 100644 (file)
--- 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 : rootbindir)
+                install_dir : rootlibexecdir)
 endif
 
 if conf.get('ENABLE_USERDB') == 1

diff --git a/units/systemd-sysext.service.in b/units/systemd-sysext.service.in
index 17b0837554298624e73f83251bc368a3e7314da9..aee30cc4b58263d23189d0d47a4dc24a0e99f8f8 100644 (file)
--- a/units/systemd-sysext.service.in
+++ b/units/systemd-sysext.service.in
@@ -24,8 +24,8 @@ ConditionDirectoryNotEmpty=|/usr/lib/extensions
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-sysext --merge
-ExecStop=@rootbindir@/systemd-sysext --unmerge
+ExecStart=@rootlibexecdir@/systemd-sysext --merge
+ExecStop=@rootlibexecdir@/systemd-sysext --unmerge
 
 [Install]
 WantedBy=sysinit.target