diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-12-18 09:14:57 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-01-20 16:50:16 +0100 |
| commit | cdc6804b6046282a42117678751c126a022cd24a (patch) | |
| tree | aaedb8a96dc54b8f25fdbb83ee794df42c838ae3 /units/user | |
| parent | 5608deb847b793738b861b02e89590ac4ba7cadd (diff) | |
| download | systemd-cdc6804b6046282a42117678751c126a022cd24a.tar.gz | |
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.
Diffstat (limited to 'units/user')
| -rw-r--r-- | units/user/meson.build | 18 | ||||
| -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 |
3 files changed, 5 insertions, 17 deletions
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] |