sysupdate: move back to libexecdir to mark as experimental

Fixes https://github.com/systemd/systemd/issues/43498

src/sysupdate/meson.build

@@ -24,7 +24,7 @@ systemd_updatectl_sources = files(
 )
 
 executables += [
-        executable_template + {
+        libexec_template + {
                 'name' : 'systemd-sysupdate',
                 'public' : true,
                 'conditions' : ['ENABLE_SYSUPDATE'],
@@ -63,10 +63,3 @@ if conf.get('ENABLE_SYSUPDATED') == 1
         install_data('org.freedesktop.sysupdate1.policy',
                      install_dir : polkitpolicydir)
 endif
-
-if conf.get('ENABLE_SYSUPDATE') == 1
-        # symlink for backwards compatibility after rename
-        install_symlink('systemd-sysupdate',
-                        pointing_to : libexecdir_to_bin / 'systemd-sysupdate',
-                        install_dir : libexecdir)
-endif

test/units/TEST-72-SYSUPDATE.sh

@@ -5,7 +5,7 @@
 set -eux
 set -o pipefail
 
-SYSUPDATE=/usr/bin/systemd-sysupdate
+SYSUPDATE=/usr/lib/systemd/systemd-sysupdate
 SYSUPDATED=/lib/systemd/systemd-sysupdated
 UPDATECTL=""
 VARLINK_SOCKET=/run/systemd/io.systemd.SysUpdate

units/meson.build

@@ -881,11 +881,11 @@ units = [
           'conditions' : ['ENABLE_SYSINSTALL'],
         },
         {
-          'file' : 'systemd-sysupdate-auto-enable.service',
+          'file' : 'systemd-sysupdate-auto-enable.service.in',
           'conditions' : ['ENABLE_SYSUPDATE'],
         },
         {
-          'file' : 'systemd-sysupdate-reboot.service',
+          'file' : 'systemd-sysupdate-reboot.service.in',
           'conditions' : ['ENABLE_SYSUPDATE'],
         },
         {
@@ -893,12 +893,12 @@ units = [
           'conditions' : ['ENABLE_SYSUPDATE'],
         },
         {
-          'file' : 'systemd-sysupdate-update.service',
+          'file' : 'systemd-sysupdate-update.service.in',
           'conditions' : ['ENABLE_SYSUPDATE'],
           'symlinks' : ['systemd-sysupdate.service'],  # compatibility after rename
         },
         {
-          'file' : 'systemd-sysupdate@.service',
+          'file' : 'systemd-sysupdate@.service.in',
           'conditions' : ['ENABLE_SYSUPDATE'],
         },
         {

units/systemd-sysupdate-auto-enable.service.in

@@ -14,8 +14,8 @@ Before=systemd-sysupdate-update.service
 
 [Service]
 Type=oneshot
-ExecStart=systemd-sysupdate enable-component --component-suggested
-ExecStart=systemd-sysupdate enable-feature --component-all --feature-suggested
+ExecStart={{LIBEXECDIR}}/systemd-sysupdate enable-component --component-suggested
+ExecStart={{LIBEXECDIR}}/systemd-sysupdate enable-feature --component-all --feature-suggested
 
 [Install]
 WantedBy=systemd-sysupdate-update.service

units/systemd-sysupdate-reboot.service.in

@@ -14,7 +14,7 @@ ConditionVirtualization=!container
 
 [Service]
 Type=oneshot
-ExecStart=systemd-sysupdate reboot
+ExecStart={{LIBEXECDIR}}/systemd-sysupdate reboot
 
 [Install]
 Also=systemd-sysupdate-reboot.timer

units/systemd-sysupdate-update.service.in

@@ -17,7 +17,7 @@ ConditionVirtualization=!container
 [Service]
 Type=simple
 NotifyAccess=main
-ExecStart=systemd-sysupdate update --component-all --cleanup=yes
+ExecStart={{LIBEXECDIR}}/systemd-sysupdate update --component-all --cleanup=yes
 
 # Keep this sandboxing synchronised with systemd-sysupdate@.service
 CapabilityBoundingSet=CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD CAP_SETFCAP CAP_SYS_ADMIN CAP_SETPCAP CAP_DAC_OVERRIDE CAP_LINUX_IMMUTABLE

units/systemd-sysupdate@.service.in

@@ -15,7 +15,7 @@ Conflicts=shutdown.target
 Before=shutdown.target
 
 [Service]
-ExecStart=-systemd-sysupdate
+ExecStart=-{{LIBEXECDIR}}/systemd-sysupdate
 
 # Keep this sandboxing synchronised with systemd-sysupdate-update.service
 CapabilityBoundingSet=CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD CAP_SETFCAP CAP_SYS_ADMIN CAP_SETPCAP CAP_DAC_OVERRIDE CAP_LINUX_IMMUTABLE