diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2024-03-08 18:08:50 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2024-03-15 21:31:44 +0100 |
| commit | 7b799b870f1dea107aa6eb1fcf24dd995fcf0fb2 (patch) | |
| tree | 329f909a0a0088d094a72dd68c399b40d02270d9 | |
| parent | mkosi: Do disk space cleanup asynchronously (diff) | |
| download | systemd-7b799b870f1dea107aa6eb1fcf24dd995fcf0fb2.tar.xz systemd-7b799b870f1dea107aa6eb1fcf24dd995fcf0fb2.zip | |
units: use relative path
| -rw-r--r-- | units/emergency.service.in | 2 | ||||
| -rw-r--r-- | units/meson.build | 4 | ||||
| -rw-r--r-- | units/rescue.service.in | 2 | ||||
| -rw-r--r-- | units/systemd-bootctl@.service (renamed from units/systemd-bootctl@.service.in) | 2 | ||||
| -rw-r--r-- | units/systemd-repart.service (renamed from units/systemd-repart.service.in) | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/units/emergency.service.in b/units/emergency.service.in index 8f70cbe567..25aa8ec510 100644 --- a/units/emergency.service.in +++ b/units/emergency.service.in @@ -19,7 +19,7 @@ Before=rescue.service [Service] Environment=HOME=/root WorkingDirectory=-/root -ExecStartPre=-{{BINDIR}}/plymouth --wait quit +ExecStartPre=-plymouth --wait quit ExecStart=-{{LIBEXECDIR}}/systemd-sulogin-shell emergency Type=idle StandardInput=tty-force diff --git a/units/meson.build b/units/meson.build index 151d3bc609..8808c5501c 100644 --- a/units/meson.build +++ b/units/meson.build @@ -273,7 +273,7 @@ units = [ 'conditions' : ['ENABLE_BOOTLOADER'], }, { - 'file' : 'systemd-bootctl@.service.in', + 'file' : 'systemd-bootctl@.service', 'conditions' : ['ENABLE_BOOTLOADER'], }, { @@ -576,7 +576,7 @@ units = [ { 'file' : 'systemd-reboot.service' }, { 'file' : 'systemd-remount-fs.service.in' }, { - 'file' : 'systemd-repart.service.in', + 'file' : 'systemd-repart.service', 'conditions' : ['ENABLE_REPART'], 'symlinks' : ['sysinit.target.wants/', 'initrd-root-fs.target.wants/'], }, diff --git a/units/rescue.service.in b/units/rescue.service.in index 5113408942..add604724a 100644 --- a/units/rescue.service.in +++ b/units/rescue.service.in @@ -18,7 +18,7 @@ Before=shutdown.target [Service] Environment=HOME=/root WorkingDirectory=-/root -ExecStartPre=-{{BINDIR}}/plymouth --wait quit +ExecStartPre=-plymouth --wait quit ExecStart=-{{LIBEXECDIR}}/systemd-sulogin-shell rescue Type=idle StandardInput=tty-force diff --git a/units/systemd-bootctl@.service.in b/units/systemd-bootctl@.service index 73175f1a93..5de6156638 100644 --- a/units/systemd-bootctl@.service.in +++ b/units/systemd-bootctl@.service @@ -17,4 +17,4 @@ Before=shutdown.target [Service] Environment=LISTEN_FDNAMES=varlink -ExecStart={{BINDIR}}/bootctl +ExecStart=bootctl diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service index 2b57b93ca8..5c9e6fb8b1 100644 --- a/units/systemd-repart.service.in +++ b/units/systemd-repart.service @@ -29,7 +29,7 @@ Before=shutdown.target initrd-switch-root.target [Service] Type=oneshot RemainAfterExit=yes -ExecStart={{BINDIR}}/systemd-repart --dry-run=no +ExecStart=systemd-repart --dry-run=no # The tool returns 76 if it can't find the root block device SuccessExitStatus=76 |