meson: move systemd-sysupdate to /usr/bin/

Let's make systemd-sysupdate easy to call. It was added in 2021
and it's around to stay and not "experimental" in any way.

diff --git a/src/sysupdate/meson.build b/src/sysupdate/meson.build
index 3a1ee1a048c621c5f03da301dfd72dcc0ecd636e..0cfe22f5283dd16718c8d8901b3236648e21402c 100644 (file)
--- a/src/sysupdate/meson.build
+++ b/src/sysupdate/meson.build
@@ -21,7 +21,7 @@ systemd_updatectl_sources = files(
 )
 
 executables += [
-        libexec_template + {
+        executable_template + {
                 'name' : 'systemd-sysupdate',
                 'public' : true,
                 'conditions' : ['ENABLE_SYSUPDATE'],
@@ -57,3 +57,10 @@ 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

diff --git a/test/units/TEST-72-SYSUPDATE.sh b/test/units/TEST-72-SYSUPDATE.sh
index 6709cd543f926d4cf1edcb1552d9d6f2fccdf853..0e9bf78646e46e5b1820309ca88af63f1347434c 100755 (executable)
--- a/test/units/TEST-72-SYSUPDATE.sh
+++ b/test/units/TEST-72-SYSUPDATE.sh
@@ -5,7 +5,7 @@
 set -eux
 set -o pipefail
 
-SYSUPDATE=/lib/systemd/systemd-sysupdate
+SYSUPDATE=/usr/bin/systemd-sysupdate
 SYSUPDATED=/lib/systemd/systemd-sysupdated
 SECTOR_SIZES=(512 4096)
 WORKDIR="$(mktemp -d /var/tmp/test-72-XXXXXX)"

diff --git a/units/meson.build b/units/meson.build
index fca299aa8465a1b6a916c39ee1d2a55b4fc40885..c78835aa70e315e15b96a1b9ff737cea9531dc0e 100644 (file)
--- a/units/meson.build
+++ b/units/meson.build
@@ -785,7 +785,7 @@ units = [
           'symlinks' : ['system-install.target.wants/'],
         },
         {
-          'file' : 'systemd-sysupdate-reboot.service.in',
+          'file' : 'systemd-sysupdate-reboot.service',
           'conditions' : ['ENABLE_SYSUPDATE'],
         },
         {
@@ -793,7 +793,7 @@ units = [
           'conditions' : ['ENABLE_SYSUPDATE'],
         },
         {
-          'file' : 'systemd-sysupdate.service.in',
+          'file' : 'systemd-sysupdate.service',
           'conditions' : ['ENABLE_SYSUPDATE'],
         },
         {

diff --git a/units/systemd-sysupdate-reboot.service.in b/units/systemd-sysupdate-reboot.service
similarity index 91%
rename from units/systemd-sysupdate-reboot.service.in
rename to units/systemd-sysupdate-reboot.service
index 5d4011a21327ffa247aef7f25343cb3553c9d37e..6750fc431ef7e0d07c461e5dab339945ecc156c0 100644 (file)
--- a/units/systemd-sysupdate-reboot.service.in
+++ b/units/systemd-sysupdate-reboot.service
@@ -14,7 +14,7 @@ ConditionVirtualization=!container
 
 [Service]
 Type=oneshot
-ExecStart={{LIBEXECDIR}}/systemd-sysupdate reboot
+ExecStart=systemd-sysupdate reboot
 
 [Install]
 Also=systemd-sysupdate-reboot.timer

diff --git a/units/systemd-sysupdate.service.in b/units/systemd-sysupdate.service
similarity index 95%
rename from units/systemd-sysupdate.service.in
rename to units/systemd-sysupdate.service
index 1becbec5edeb4e80d43446ca3befbdf702e71822..fc4d74a583f08a148d507fae8aa6eaf787e281b4 100644 (file)
--- a/units/systemd-sysupdate.service.in
+++ b/units/systemd-sysupdate.service
@@ -17,7 +17,7 @@ ConditionVirtualization=!container
 [Service]
 Type=simple
 NotifyAccess=main
-ExecStart={{LIBEXECDIR}}/systemd-sysupdate update
+ExecStart=systemd-sysupdate update
 CapabilityBoundingSet=CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD CAP_SETFCAP CAP_SYS_ADMIN CAP_SETPCAP CAP_DAC_OVERRIDE CAP_LINUX_IMMUTABLE
 NoNewPrivileges=yes
 MemoryDenyWriteExecute=yes