units: use relative path

diff --git a/units/emergency.service.in b/units/emergency.service.in
index 8f70cbe567d32d7920aacf1b16f00bc92f69135c..25aa8ec5106d5fe91b79d3f5cd76f2380a8e0d1d 100644 (file)
--- 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 151d3bc6098a5f3217c95f53c5557ef67dae921f..8808c5501c80077471b38e802bacb7eaed6b8d65 100644 (file)
--- 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 5113408942125188e8b23edfe41a260b75c00154..add604724a7e0176c4c2814407f70ea865af5eec 100644 (file)
--- 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
similarity index 94%
rename from units/systemd-bootctl@.service.in
rename to units/systemd-bootctl@.service
index 73175f1a93da3c42aff89703c60ec4cf0fa6d8d4..5de61566380dd2f11c051782bdf820a53b64603c 100644 (file)
--- 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
similarity index 96%
rename from units/systemd-repart.service.in
rename to units/systemd-repart.service
index 2b57b93ca874878575af15138a826449dac4f705..5c9e6fb8b1ff3084b65a41a134bebf671deaa7d5 100644 (file)
--- 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