systemctl location is now derived from --bindir= configure option

systemd-cron · Nov 17, 2014 · 4225195 · 4225195
1 parent 716ccdf
commit 4225195
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -51,6 +51,7 @@ define in2out
 		-e "s|\@package\@|$(package)|g" \
 		-e "s|\@confdir\@|$(confdir)|g" \
 		-e "s|\@statedir\@|$(statedir)|g" \
+		-e "s|\@bindir\@|$(bindir)|g" \
 		-e "s|\@libdir\@|$(libdir)|g" \
 		-e "s|\@unitdir\@|$(unitdir)|g" \
 		-e "s|\@runparts\@|$(runparts)|g" \

diff --git a/src/bin/systemd-crontab-generator b/src/bin/systemd-crontab-generator
@@ -491,7 +491,7 @@ if __name__ == '__main__':
 
             f.write('\n[Service]\n')
             f.write('Type=oneshot\n')
-            f.write('ExecStart=/bin/sh -c "/bin/systemctl daemon-reload ; /bin/systemctl try-restart cron.target"\n')
+            f.write('ExecStart=/bin/sh -c "@bindir@/systemctl daemon-reload ; @bindir@/systemctl try-restart cron.target"\n')
 
         MULTIUSER_DIR = os.path.join(TARGET_DIR, 'multi-user.target.wants')
 

diff --git a/src/units/cron-update.service.in b/src/units/cron-update.service.in
@@ -5,4 +5,4 @@ Documentation=man:systemd.cron(7)
 [Service]
 Type=oneshot
 ExecStartPre=/usr/bin/touch /run/crond.reboot
-ExecStart=/bin/sh -c '/bin/systemctl daemon-reload ; sleep 1 ; /bin/systemctl restart cron.target'
+ExecStart=/bin/sh -c '@bindir@/systemctl daemon-reload ; sleep 1 ; @bindir@/systemctl restart cron.target'