From: Luca Boccassi <luca.boccassi@microsoft.com>
Date: Mon, 18 Jan 2021 16:07:12 +0000 (+0000)
Subject: sysext: install in /usr/lib/systemd/ for now
X-Git-Tag: v248-rc1~298^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F18181%2Fhead;p=thirdparty%2Fsystemd.git

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 9b47e6ad033..14b919d0c9f 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 : 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 17b08375542..aee30cc4b58 100644
--- 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