summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2015-05-24 16:33:35 -0400
committerTom Gundersen <teg@jklm.no>2015-05-24 22:44:29 +0200
commit77eb82f9f0f60535ab5f585834ed6e66cf39b184 (patch)
tree96e9ad81d93fb86c88e0a97cea78c247acc55ffa
parent637aa8a36ce21e0c83466d9b91ee1bfad2404d1c (diff)
shared: generator - correct path to systemd-fsck
In generated systemd-fsck-root.service. This would break if rootprefix is not /usr/lib/systemd. [tomegun: flesh out commit message]
-rw-r--r--Makefile.am1
-rw-r--r--src/shared/generator.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index f84a28d98f..70d4dc004e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -188,6 +188,7 @@ AM_CPPFLAGS = \
-DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
+ -DSYSTEMD_FSCK_PATH=\"$(rootlibexecdir)/systemd-fsck\" \
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
-DSYSTEMD_SLEEP_BINARY_PATH=\"$(rootlibexecdir)/systemd-sleep\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
diff --git a/src/shared/generator.c b/src/shared/generator.c
index 81284995f5..807569a1b8 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -61,7 +61,7 @@ static int write_fsck_sysroot_service(const char *dir, const char *what) {
"[Service]\n"
"Type=oneshot\n"
"RemainAfterExit=yes\n"
- "ExecStart=/usr/lib/systemd/systemd-fsck %2$s\n"
+ "ExecStart=" SYSTEMD_FSCK_PATH " %2$s\n"
"TimeoutSec=0\n",
program_invocation_short_name,
what,