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]

diff --git a/Makefile.am b/Makefile.am
index f84a28d98f9d862610cf66b88277a4177cc5fd7a..70d4dc004e877a7ddfc63f10ff416fa639e02d22 100644 (file)
--- 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 81284995f5ab1c2d58ecf68513756abcf72ee3f0..807569a1b8b008bde3f9fba4d5295e639d857f69 100644 (file)
--- 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,