sysext: install in rootbindir, remove template from unit

This reverts commit 71ad75f.

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

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

units/systemd-sysext.service.in → 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