summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meson.build1
-rw-r--r--units/initrd-cleanup.service (renamed from units/initrd-cleanup.service.in)2
-rw-r--r--units/initrd-parse-etc.service (renamed from units/initrd-parse-etc.service.in)6
-rw-r--r--units/initrd-switch-root.service (renamed from units/initrd-switch-root.service.in)2
-rw-r--r--units/initrd-udevadm-cleanup-db.service (renamed from units/initrd-udevadm-cleanup-db.service.in)2
-rw-r--r--units/meson.build66
-rw-r--r--units/systemd-ask-password-console.service (renamed from units/systemd-ask-password-console.service.in)2
-rw-r--r--units/systemd-ask-password-wall.service (renamed from units/systemd-ask-password-wall.service.in)4
-rw-r--r--units/systemd-boot-system-token.service (renamed from units/systemd-boot-system-token.service.in)2
-rw-r--r--units/systemd-firstboot.service (renamed from units/systemd-firstboot.service.in)2
-rw-r--r--units/systemd-halt.service (renamed from units/systemd-halt.service.in)2
-rw-r--r--units/systemd-hwdb-update.service.in2
-rw-r--r--units/systemd-journal-catalog-update.service (renamed from units/systemd-journal-catalog-update.service.in)2
-rw-r--r--units/systemd-journal-flush.service (renamed from units/systemd-journal-flush.service.in)4
-rw-r--r--units/systemd-kexec.service (renamed from units/systemd-kexec.service.in)2
-rw-r--r--units/systemd-machine-id-commit.service (renamed from units/systemd-machine-id-commit.service.in)2
-rw-r--r--units/systemd-nspawn@.service.in2
-rw-r--r--units/systemd-sysusers.service (renamed from units/systemd-sysusers.service.in)2
-rw-r--r--units/systemd-tmpfiles-clean.service (renamed from units/systemd-tmpfiles-clean.service.in)2
-rw-r--r--units/systemd-tmpfiles-setup-dev.service (renamed from units/systemd-tmpfiles-setup-dev.service.in)2
-rw-r--r--units/systemd-tmpfiles-setup.service (renamed from units/systemd-tmpfiles-setup.service.in)2
-rw-r--r--units/systemd-udev-settle.service (renamed from units/systemd-udev-settle.service.in)2
-rw-r--r--units/systemd-udev-trigger.service (renamed from units/systemd-udev-trigger.service.in)4
-rw-r--r--units/systemd-udevd.service.in2
-rw-r--r--units/user/meson.build18
-rw-r--r--units/user/systemd-tmpfiles-clean.service (renamed from units/user/systemd-tmpfiles-clean.service.in)2
-rw-r--r--units/user/systemd-tmpfiles-setup.service (renamed from units/user/systemd-tmpfiles-setup.service.in)2
27 files changed, 65 insertions, 78 deletions
diff --git a/meson.build b/meson.build
index 46f3e9c7ba..848140bb03 100644
--- a/meson.build
+++ b/meson.build
@@ -281,7 +281,6 @@ substs.set('userenvgeneratordir', userenvgeneratordi
substs.set('systemshutdowndir', systemshutdowndir)
substs.set('systemsleepdir', systemsleepdir)
substs.set('CERTIFICATEROOT', get_option('certificate-root'))
-substs.set('SYSTEMCTL', join_paths(rootbindir, 'systemctl'))
substs.set('RANDOM_SEED', join_paths(randomseeddir, 'random-seed'))
substs.set('SYSTEM_SYSVINIT_PATH', sysvinit_path)
substs.set('SYSTEM_SYSVRCND_PATH', sysvrcnd_path)
diff --git a/units/initrd-cleanup.service.in b/units/initrd-cleanup.service
index 9775540c94..b046076715 100644
--- a/units/initrd-cleanup.service.in
+++ b/units/initrd-cleanup.service
@@ -17,4 +17,4 @@ After=initrd-root-fs.target initrd-fs.target initrd.target
[Service]
Type=oneshot
-ExecStart=@rootbindir@/systemctl --no-block isolate initrd-switch-root.target
+ExecStart=systemctl --no-block isolate initrd-switch-root.target
diff --git a/units/initrd-parse-etc.service.in b/units/initrd-parse-etc.service
index 2b3cd61cd6..b0e38368cf 100644
--- a/units/initrd-parse-etc.service.in
+++ b/units/initrd-parse-etc.service
@@ -18,7 +18,7 @@ ConditionPathExists=/etc/initrd-release
[Service]
Type=oneshot
-ExecStartPre=-@rootbindir@/systemctl daemon-reload
+ExecStartPre=-systemctl daemon-reload
# we have to retrigger initrd-fs.target after daemon-reload
-ExecStart=-@rootbindir@/systemctl --no-block start initrd-fs.target
-ExecStart=@rootbindir@/systemctl --no-block start initrd-cleanup.service
+ExecStart=-systemctl --no-block start initrd-fs.target
+ExecStart=systemctl --no-block start initrd-cleanup.service
diff --git a/units/initrd-switch-root.service.in b/units/initrd-switch-root.service
index 6ce468e872..c1a3792888 100644
--- a/units/initrd-switch-root.service.in
+++ b/units/initrd-switch-root.service
@@ -17,4 +17,4 @@ AllowIsolate=yes
[Service]
Type=oneshot
-ExecStart=@rootbindir@/systemctl --no-block switch-root /sysroot
+ExecStart=systemctl --no-block switch-root /sysroot
diff --git a/units/initrd-udevadm-cleanup-db.service.in b/units/initrd-udevadm-cleanup-db.service
index 09af690986..ad2f2a5b35 100644
--- a/units/initrd-udevadm-cleanup-db.service.in
+++ b/units/initrd-udevadm-cleanup-db.service
@@ -17,4 +17,4 @@ Before=initrd-switch-root.target
[Service]
Type=oneshot
-ExecStart=-@rootbindir@/udevadm info --cleanup-db
+ExecStart=-udevadm info --cleanup-db
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', '',
diff --git a/units/systemd-ask-password-console.service.in b/units/systemd-ask-password-console.service
index 60fa7c3200..6ee4c253a3 100644
--- a/units/systemd-ask-password-console.service.in
+++ b/units/systemd-ask-password-console.service
@@ -17,5 +17,5 @@ Before=shutdown.target
ConditionPathExists=!/run/plymouth/pid
[Service]
-ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --console
+ExecStart=systemd-tty-ask-password-agent --watch --console
SystemCallArchitectures=native
diff --git a/units/systemd-ask-password-wall.service.in b/units/systemd-ask-password-wall.service
index 1e4808b6d5..52a3037cd4 100644
--- a/units/systemd-ask-password-wall.service.in
+++ b/units/systemd-ask-password-wall.service
@@ -13,6 +13,6 @@ Documentation=man:systemd-ask-password-console.service(8)
After=systemd-user-sessions.service
[Service]
-ExecStartPre=-@SYSTEMCTL@ stop systemd-ask-password-console.path systemd-ask-password-console.service systemd-ask-password-plymouth.path systemd-ask-password-plymouth.service
-ExecStart=@rootbindir@/systemd-tty-ask-password-agent --wall
+ExecStartPre=-systemctl stop systemd-ask-password-console.path systemd-ask-password-console.service systemd-ask-password-plymouth.path systemd-ask-password-plymouth.service
+ExecStart=systemd-tty-ask-password-agent --wall
SystemCallArchitectures=native
diff --git a/units/systemd-boot-system-token.service.in b/units/systemd-boot-system-token.service
index e9b742c5c7..8aead02417 100644
--- a/units/systemd-boot-system-token.service.in
+++ b/units/systemd-boot-system-token.service
@@ -31,4 +31,4 @@ ConditionPathExists=|!/sys/firmware/efi/efivars/LoaderRandomSeed-4a67b082-0a4c-4
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=@bindir@/bootctl random-seed --graceful
+ExecStart=bootctl random-seed --graceful
diff --git a/units/systemd-firstboot.service.in b/units/systemd-firstboot.service
index d4deba90b7..9f5c7101cd 100644
--- a/units/systemd-firstboot.service.in
+++ b/units/systemd-firstboot.service
@@ -20,7 +20,7 @@ ConditionFirstBoot=yes
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-firstboot --prompt-locale --prompt-timezone --prompt-root-password
+ExecStart=systemd-firstboot --prompt-locale --prompt-timezone --prompt-root-password
StandardOutput=tty
StandardInput=tty
StandardError=tty
diff --git a/units/systemd-halt.service.in b/units/systemd-halt.service
index 09c1005829..cd16d1de20 100644
--- a/units/systemd-halt.service.in
+++ b/units/systemd-halt.service
@@ -16,4 +16,4 @@ After=shutdown.target umount.target final.target
[Service]
Type=oneshot
-ExecStart=@SYSTEMCTL@ --force halt
+ExecStart=systemctl --force halt
diff --git a/units/systemd-hwdb-update.service.in b/units/systemd-hwdb-update.service.in
index 259fe0de8b..9887018a1f 100644
--- a/units/systemd-hwdb-update.service.in
+++ b/units/systemd-hwdb-update.service.in
@@ -22,5 +22,5 @@ ConditionDirectoryNotEmpty=|/etc/udev/hwdb.d/
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-hwdb update
+ExecStart=systemd-hwdb update
TimeoutSec=90s
diff --git a/units/systemd-journal-catalog-update.service.in b/units/systemd-journal-catalog-update.service
index 18b2739ffa..6db55a5490 100644
--- a/units/systemd-journal-catalog-update.service.in
+++ b/units/systemd-journal-catalog-update.service
@@ -19,5 +19,5 @@ ConditionNeedsUpdate=/var
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=@rootbindir@/journalctl --update-catalog
+ExecStart=journalctl --update-catalog
TimeoutSec=90s
diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service
index 29b006cba5..0f45743fa0 100644
--- a/units/systemd-journal-flush.service.in
+++ b/units/systemd-journal-flush.service
@@ -17,8 +17,8 @@ Before=systemd-tmpfiles-setup.service
RequiresMountsFor=/var/log/journal
[Service]
-ExecStart=@rootbindir@/journalctl --flush
-ExecStop=@rootbindir@/journalctl --smart-relinquish-var
+ExecStart=journalctl --flush
+ExecStop=journalctl --smart-relinquish-var
Type=oneshot
RemainAfterExit=yes
TimeoutSec=90s
diff --git a/units/systemd-kexec.service.in b/units/systemd-kexec.service
index 1201b23289..7413e1d6b1 100644
--- a/units/systemd-kexec.service.in
+++ b/units/systemd-kexec.service
@@ -16,4 +16,4 @@ After=shutdown.target umount.target final.target
[Service]
Type=oneshot
-ExecStart=@SYSTEMCTL@ --force kexec
+ExecStart=systemctl --force kexec
diff --git a/units/systemd-machine-id-commit.service.in b/units/systemd-machine-id-commit.service
index 4f348730ee..e3acb0f326 100644
--- a/units/systemd-machine-id-commit.service.in
+++ b/units/systemd-machine-id-commit.service
@@ -20,5 +20,5 @@ ConditionPathIsMountPoint=/etc/machine-id
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-machine-id-setup --commit
+ExecStart=systemd-machine-id-setup --commit
TimeoutSec=30s
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index 5367ee4410..51634472ac 100644
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -18,7 +18,7 @@ RequiresMountsFor=/var/lib/machines
[Service]
# Make sure the DeviceAllow= lines below can properly resolve the 'block-loop' expression (and others)
-ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i
+ExecStart=systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i
KillMode=mixed
Type=notify
RestartForceExitStatus=133
diff --git a/units/systemd-sysusers.service.in b/units/systemd-sysusers.service
index 4d11bbb762..da05e0eb1b 100644
--- a/units/systemd-sysusers.service.in
+++ b/units/systemd-sysusers.service
@@ -19,5 +19,5 @@ ConditionNeedsUpdate=/etc
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-sysusers
+ExecStart=systemd-sysusers
TimeoutSec=90s
diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service
index 5d70aafb29..f20bb143ef 100644
--- a/units/systemd-tmpfiles-clean.service.in
+++ b/units/systemd-tmpfiles-clean.service
@@ -17,6 +17,6 @@ Before=shutdown.target
[Service]
Type=oneshot
-ExecStart=@rootbindir@/systemd-tmpfiles --clean
+ExecStart=systemd-tmpfiles --clean
SuccessExitStatus=DATAERR
IOSchedulingClass=idle
diff --git a/units/systemd-tmpfiles-setup-dev.service.in b/units/systemd-tmpfiles-setup-dev.service
index ed52db4953..1027823859 100644
--- a/units/systemd-tmpfiles-setup-dev.service.in
+++ b/units/systemd-tmpfiles-setup-dev.service
@@ -18,5 +18,5 @@ Before=sysinit.target local-fs-pre.target systemd-udevd.service shutdown.target
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-tmpfiles --prefix=/dev --create --boot
+ExecStart=systemd-tmpfiles --prefix=/dev --create --boot
SuccessExitStatus=DATAERR CANTCREAT
diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service
index 32a475d715..29799ee81c 100644
--- a/units/systemd-tmpfiles-setup.service.in
+++ b/units/systemd-tmpfiles-setup.service
@@ -19,5 +19,5 @@ RefuseManualStop=yes
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
+ExecStart=systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
SuccessExitStatus=DATAERR CANTCREAT
diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service
index 22ebf08c51..ed6a68b864 100644
--- a/units/systemd-udev-settle.service.in
+++ b/units/systemd-udev-settle.service
@@ -24,4 +24,4 @@ ConditionPathIsReadWrite=/sys
Type=oneshot
TimeoutSec=180
RemainAfterExit=yes
-ExecStart=@rootbindir@/udevadm settle
+ExecStart=udevadm settle
diff --git a/units/systemd-udev-trigger.service.in b/units/systemd-udev-trigger.service
index b60204eccc..8a625b6305 100644
--- a/units/systemd-udev-trigger.service.in
+++ b/units/systemd-udev-trigger.service
@@ -19,5 +19,5 @@ ConditionPathIsReadWrite=/sys
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=@rootbindir@/udevadm trigger --type=subsystems --action=add
-ExecStart=@rootbindir@/udevadm trigger --type=devices --action=add
+ExecStart=udevadm trigger --type=subsystems --action=add
+ExecStart=udevadm trigger --type=devices --action=add
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
index 8b1dd0efc7..5eee69933b 100644
--- a/units/systemd-udevd.service.in
+++ b/units/systemd-udevd.service.in
@@ -23,7 +23,7 @@ Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket
Restart=always
RestartSec=0
ExecStart=@rootlibexecdir@/systemd-udevd
-ExecReload=@rootbindir@/udevadm control --reload --timeout 0
+ExecReload=udevadm control --reload --timeout 0
KillMode=mixed
TasksMax=infinity
PrivateMounts=yes
diff --git a/units/user/meson.build b/units/user/meson.build
index 36341a42f5..cb8f630b8c 100644
--- a/units/user/meson.build
+++ b/units/user/meson.build
@@ -13,26 +13,14 @@ units = [
'smartcard.target',
'sockets.target',
'sound.target',
- 'timers.target',
'systemd-exit.service',
+ 'systemd-tmpfiles-clean.service',
'systemd-tmpfiles-clean.timer',
+ 'systemd-tmpfiles-setup.service',
+ 'timers.target',
]
foreach file : units
install_data(file,
install_dir : userunitdir)
endforeach
-
-in_units = [
- 'systemd-tmpfiles-clean.service',
- 'systemd-tmpfiles-setup.service',
-]
-
-foreach file : in_units
- gen = configure_file(
- input : file + '.in',
- output : file,
- configuration : substs)
- install_data(gen,
- install_dir : userunitdir)
-endforeach
diff --git a/units/user/systemd-tmpfiles-clean.service.in b/units/user/systemd-tmpfiles-clean.service
index 306b064e89..3be0de5f7d 100644
--- a/units/user/systemd-tmpfiles-clean.service.in
+++ b/units/user/systemd-tmpfiles-clean.service
@@ -16,6 +16,6 @@ Before=basic.target shutdown.target
[Service]
Type=oneshot
-ExecStart=@rootbindir@/systemd-tmpfiles --user --clean
+ExecStart=systemd-tmpfiles --user --clean
SuccessExitStatus=DATAERR
IOSchedulingClass=idle
diff --git a/units/user/systemd-tmpfiles-setup.service.in b/units/user/systemd-tmpfiles-setup.service
index a852ef5748..c4b29cbe8c 100644
--- a/units/user/systemd-tmpfiles-setup.service.in
+++ b/units/user/systemd-tmpfiles-setup.service
@@ -18,7 +18,7 @@ RefuseManualStop=yes
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=@rootbindir@/systemd-tmpfiles --user --create --remove --boot
+ExecStart=systemd-tmpfiles --user --create --remove --boot
SuccessExitStatus=DATAERR
[Install]
View Lorry Controller Status