units: drop full paths for utilities in $PATH

This makes things a bit simpler and the build a bit faster, because we don't
have to rewrite files to do the trivial substitution. @rootbindir@ is always in
our internal $PATH that we use for non-absolute paths, so there should be no
functional change.

1 files changed, 33 insertions, 33 deletions

diff --git a/units/meson.build b/units/meson.build
index 82c399bee8..f7653c920c 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -23,10 +23,14 @@ units = [
         ['hibernate.target',                    'ENABLE_HIBERNATE'],
         ['hybrid-sleep.target',                 'ENABLE_HIBERNATE'],
         ['suspend-then-hibernate.target',       'ENABLE_HIBERNATE'],
+        ['initrd-cleanup.service',              ''],
         ['initrd-fs.target',                    ''],
+        ['initrd-parse-etc.service',            ''],
         ['initrd-root-device.target',           ''],
         ['initrd-root-fs.target',               ''],
+        ['initrd-switch-root.service',          ''],
         ['initrd-switch-root.target',           ''],
+        ['initrd-udevadm-cleanup-db.service',   ''],
         ['initrd.target',                       ''],
         ['kexec.target',                        ''],
         ['ldconfig.service',                    'ENABLE_LDCONFIG',
@@ -81,13 +85,24 @@ units = [
         ['system-update-cleanup.service',       ''],
         ['systemd-ask-password-console.path',   '',
          'sysinit.target.wants/'],
+        ['systemd-ask-password-console.service', ''],
         ['systemd-ask-password-wall.path',      '',
          'multi-user.target.wants/'],
+        ['systemd-ask-password-wall.service',   ''],
+        ['systemd-boot-system-token.service',   'ENABLE_EFI',
+         'sysinit.target.wants/'],
         ['systemd-coredump.socket',             'ENABLE_COREDUMP',
          'sockets.target.wants/'],
-        ['systemd-exit.service',                 ''],
+        ['systemd-exit.service',                ''],
+        ['systemd-firstboot.service',           'ENABLE_FIRSTBOOT',
+         'sysinit.target.wants/'],
+        ['systemd-halt.service',                ''],
         ['systemd-initctl.socket',              '',
          'sockets.target.wants/'],
+        ['systemd-journal-catalog-update.service', '',
+         'sysinit.target.wants/'],
+        ['systemd-journal-flush.service',       '',
+         'sysinit.target.wants/'],
         ['systemd-journal-gatewayd.socket',     'ENABLE_REMOTE HAVE_MICROHTTPD'],
         ['systemd-journal-remote.socket',       'ENABLE_REMOTE HAVE_MICROHTTPD'],
         ['systemd-journald-audit.socket',       '',
@@ -96,18 +111,31 @@ units = [
          'sockets.target.wants/'],
         ['systemd-journald.socket',             '',
          'sockets.target.wants/'],
-        ['systemd-userdbd.socket',              'ENABLE_USERDB',
-         'sockets.target.wants/'],
+        ['systemd-kexec.service',               ''],
+        ['systemd-machine-id-commit.service',   '',
+         'sysinit.target.wants/'],
         ['systemd-networkd.socket',             'ENABLE_NETWORKD'],
-        ['systemd-poweroff.service',             ''],
-        ['systemd-reboot.service',               ''],
+        ['systemd-poweroff.service',            ''],
+        ['systemd-reboot.service',              ''],
         ['systemd-rfkill.socket',               'ENABLE_RFKILL'],
+        ['systemd-sysusers.service',            'ENABLE_SYSUSERS',
+         'sysinit.target.wants/'],
+        ['systemd-tmpfiles-clean.service',      'ENABLE_TMPFILES'],
         ['systemd-tmpfiles-clean.timer',        'ENABLE_TMPFILES',
          'timers.target.wants/'],
+        ['systemd-tmpfiles-setup-dev.service',  'ENABLE_TMPFILES',
+         'sysinit.target.wants/'],
+        ['systemd-tmpfiles-setup.service',      'ENABLE_TMPFILES',
+         'sysinit.target.wants/'],
         ['systemd-udevd-control.socket',        '',
          'sockets.target.wants/'],
+        ['systemd-udev-settle.service',         ''],
+        ['systemd-udev-trigger.service',        '',
+         'sysinit.target.wants/'],
         ['systemd-udevd-kernel.socket',         '',
          'sockets.target.wants/'],
+        ['systemd-userdbd.socket',              'ENABLE_USERDB',
+         'sockets.target.wants/'],
         ['time-set.target',                     ''],
         ['time-sync.target',                    ''],
         ['timers.target',                       ''],
@@ -122,31 +150,20 @@ units = [
 in_units = [
         ['debug-shell.service',                  ''],
         ['emergency.service',                    ''],
-        ['initrd-cleanup.service',               ''],
-        ['initrd-parse-etc.service',             ''],
-        ['initrd-switch-root.service',           ''],
-        ['initrd-udevadm-cleanup-db.service',    ''],
         ['kmod-static-nodes.service',            'HAVE_KMOD ENABLE_TMPFILES',
          'sysinit.target.wants/'],
         ['quotaon.service',                      'ENABLE_QUOTACHECK'],
         ['rc-local.service',                     'HAVE_SYSV_COMPAT'],
         ['rescue.service',                       ''],
-        ['systemd-ask-password-console.service', ''],
-        ['systemd-ask-password-wall.service',    ''],
         ['systemd-backlight@.service',           'ENABLE_BACKLIGHT'],
         ['systemd-binfmt.service',               'ENABLE_BINFMT',
          'sysinit.target.wants/'],
         ['systemd-bless-boot.service',           'ENABLE_EFI HAVE_BLKID'],
         ['systemd-boot-check-no-failures.service', ''],
-        ['systemd-boot-system-token.service',    'ENABLE_EFI',
-         'sysinit.target.wants/'],
         ['systemd-coredump@.service',            'ENABLE_COREDUMP'],
         ['systemd-pstore.service',               'ENABLE_PSTORE'],
-        ['systemd-firstboot.service',            'ENABLE_FIRSTBOOT',
-         'sysinit.target.wants/'],
         ['systemd-fsck-root.service',            ''],
         ['systemd-fsck@.service',                ''],
-        ['systemd-halt.service',                 ''],
         ['systemd-hibernate-resume@.service',    'ENABLE_HIBERNATE'],
         ['systemd-hibernate.service',            'ENABLE_HIBERNATE'],
         ['systemd-hybrid-sleep.service',         'ENABLE_HIBERNATE'],
@@ -158,22 +175,15 @@ in_units = [
         ['systemd-importd.service',              'ENABLE_IMPORTD',
          'dbus-org.freedesktop.import1.service'],
         ['systemd-initctl.service',               ''],
-        ['systemd-journal-catalog-update.service', '',
-         'sysinit.target.wants/'],
-        ['systemd-journal-flush.service',         '',
-         'sysinit.target.wants/'],
         ['systemd-journal-gatewayd.service',     'ENABLE_REMOTE HAVE_MICROHTTPD'],
         ['systemd-journal-remote.service',       'ENABLE_REMOTE HAVE_MICROHTTPD'],
         ['systemd-journal-upload.service',       'ENABLE_REMOTE HAVE_LIBCURL'],
         ['systemd-journald.service',             '',
          'sysinit.target.wants/'],
-        ['systemd-kexec.service',                ''],
         ['systemd-localed.service',              'ENABLE_LOCALED',
          'dbus-org.freedesktop.locale1.service'],
         ['systemd-logind.service',               'ENABLE_LOGIND',
          'multi-user.target.wants/ dbus-org.freedesktop.login1.service'],
-        ['systemd-machine-id-commit.service',    '',
-         'sysinit.target.wants/'],
         ['systemd-machined.service',             'ENABLE_MACHINED',
          'dbus-org.freedesktop.machine1.service'],
         ['systemd-modules-load.service',         'HAVE_KMOD',
@@ -194,20 +204,10 @@ in_units = [
         ['systemd-suspend.service',              ''],
         ['systemd-sysctl.service',               '',
          'sysinit.target.wants/'],
-        ['systemd-sysusers.service',             'ENABLE_SYSUSERS',
-         'sysinit.target.wants/'],
         ['systemd-timedated.service',            'ENABLE_TIMEDATED',
          'dbus-org.freedesktop.timedate1.service'],
         ['systemd-timesyncd.service',            'ENABLE_TIMESYNCD'],
         ['systemd-time-wait-sync.service',       'ENABLE_TIMESYNCD'],
-        ['systemd-tmpfiles-clean.service',       'ENABLE_TMPFILES'],
-        ['systemd-tmpfiles-setup-dev.service',   'ENABLE_TMPFILES',
-         'sysinit.target.wants/'],
-        ['systemd-tmpfiles-setup.service',       'ENABLE_TMPFILES',
-         'sysinit.target.wants/'],
-        ['systemd-udev-settle.service',          ''],
-        ['systemd-udev-trigger.service',         '',
-         'sysinit.target.wants/'],
         ['systemd-udevd.service',                '',
          'sysinit.target.wants/'],
         ['systemd-update-done.service',          '',