Re: [systemd-devel] [PATCH] Correct path to systemd-fsck in generated systemd-fsck-root.service

2015-05-24 Thread Mike Gilbert
This should also be flagged for backports since the hard-coded
/usr/lib/systemd path will break any initramfs if rootprefix != /usr.
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Re: [systemd-devel] [PATCH] Correct path to systemd-fsck in generated systemd-fsck-root.service

2015-05-24 Thread Tom Gundersen
On Sun, May 24, 2015 at 10:33 PM, Mike Gilbert flop...@gentoo.org wrote:
 ---
  Makefile.am| 1 +
  src/shared/generator.c | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)

 diff --git a/Makefile.am b/Makefile.am
 index f84a28d..70d4dc0 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 8128499..807569a 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,
 --
 2.4.1

 ___
 systemd-devel mailing list
 systemd-devel@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Applied. Thanks!

Tom
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel