|
 |
17b0f1 |
From 36bc4ca74d03fcff5808a7efb107886749472819 Mon Sep 17 00:00:00 2001
|
|
|
17b0f1 |
From: Mike Gilbert <floppym@gentoo.org>
|
|
|
17b0f1 |
Date: Sun, 24 May 2015 16:33:35 -0400
|
|
|
17b0f1 |
Subject: [PATCH] shared: generator - correct path to systemd-fsck
|
|
|
17b0f1 |
|
|
|
17b0f1 |
In generated systemd-fsck-root.service. This would break if rootprefix
|
|
|
17b0f1 |
is not /usr/lib/systemd.
|
|
|
17b0f1 |
|
|
|
17b0f1 |
[tomegun: flesh out commit message]
|
|
|
17b0f1 |
|
|
|
17b0f1 |
(cherry picked from commit 77eb82f9f0f60535ab5f585834ed6e66cf39b184)
|
|
|
17b0f1 |
|
|
|
17b0f1 |
Cherry-picked from: 77eb82f
|
|
|
17b0f1 |
Resolves: #1222517
|
|
|
17b0f1 |
---
|
|
|
17b0f1 |
Makefile.am | 1 +
|
|
|
17b0f1 |
src/shared/generator.c | 2 +-
|
|
|
17b0f1 |
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
17b0f1 |
|
|
|
17b0f1 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
17b0f1 |
index d3fb398fe5..a81d3c131e 100644
|
|
|
17b0f1 |
--- a/Makefile.am
|
|
|
17b0f1 |
+++ b/Makefile.am
|
|
|
17b0f1 |
@@ -177,6 +177,7 @@ AM_CPPFLAGS = \
|
|
|
17b0f1 |
-DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
|
|
|
17b0f1 |
-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
|
|
|
17b0f1 |
-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
|
|
|
17b0f1 |
+ -DSYSTEMD_FSCK_PATH=\"$(rootlibexecdir)/systemd-fsck\" \
|
|
|
17b0f1 |
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
|
|
|
17b0f1 |
-DSYSTEMD_SLEEP_BINARY_PATH=\"$(rootlibexecdir)/systemd-sleep\" \
|
|
|
17b0f1 |
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
|
|
|
17b0f1 |
diff --git a/src/shared/generator.c b/src/shared/generator.c
|
|
|
17b0f1 |
index 148a0b077b..3af84a325c 100644
|
|
|
17b0f1 |
--- a/src/shared/generator.c
|
|
|
17b0f1 |
+++ b/src/shared/generator.c
|
|
|
17b0f1 |
@@ -61,7 +61,7 @@ static int write_fsck_sysroot_service(const char *dir, const char *what) {
|
|
|
17b0f1 |
"[Service]\n"
|
|
|
17b0f1 |
"Type=oneshot\n"
|
|
|
17b0f1 |
"RemainAfterExit=yes\n"
|
|
|
17b0f1 |
- "ExecStart=/usr/lib/systemd/systemd-fsck %2$s\n"
|
|
|
17b0f1 |
+ "ExecStart=" SYSTEMD_FSCK_PATH " %2$s\n"
|
|
|
17b0f1 |
"TimeoutSec=0\n",
|
|
|
17b0f1 |
program_invocation_short_name,
|
|
|
17b0f1 |
what,
|