From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 8 Mar 2024 17:08:50 +0000 (+0900)
Subject: units: use relative path
X-Git-Tag: v256-rc1~499
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b799b870f1dea107aa6eb1fcf24dd995fcf0fb2;p=thirdparty%2Fsystemd.git

units: use relative path
---

diff --git a/units/emergency.service.in b/units/emergency.service.in
index 8f70cbe567d..25aa8ec5106 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 151d3bc6098..8808c5501c8 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 51134089421..add604724a7 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
similarity index 94%
rename from units/systemd-bootctl@.service.in
rename to units/systemd-bootctl@.service
index 73175f1a93d..5de61566380 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
similarity index 96%
rename from units/systemd-repart.service.in
rename to units/systemd-repart.service
index 2b57b93ca87..5c9e6fb8b1f 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