daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1ff636
From 685ddafd9e3c5f548e02e38633f366ff453f918b Mon Sep 17 00:00:00 2001
1ff636
From: Martin Pitt <martin.pitt@ubuntu.com>
1ff636
Date: Tue, 24 Feb 2015 14:30:10 +0100
1ff636
Subject: [PATCH] bootchart: fix default init path
1ff636
1ff636
Commit 6e1bf7ab99 used the wrong directory; we need rootlibexecdir, not
1ff636
rootlibdir, as the latter is something like /lib/x86_64-linux-gnu/ on
1ff636
multi-arch systems.
1ff636
1ff636
https://launchpad.net/bugs/1423867
1ff636
(cherry picked from commit a804d849b3c2199bc25d1d4e65fc119fa4d7d0e2)
1ff636
---
1ff636
 Makefile.am               | 1 +
1ff636
 src/bootchart/bootchart.c | 2 +-
1ff636
 2 files changed, 2 insertions(+), 1 deletion(-)
1ff636
1ff636
diff --git a/Makefile.am b/Makefile.am
1ff636
index bf65b24..2e6455f 100644
1ff636
--- a/Makefile.am
1ff636
+++ b/Makefile.am
1ff636
@@ -199,6 +199,7 @@ AM_CPPFLAGS = \
1ff636
 	-DKEXEC=\"$(KEXEC)\" \
1ff636
 	-DLIBDIR=\"$(libdir)\" \
1ff636
 	-DROOTLIBDIR=\"$(rootlibdir)\" \
1ff636
+	-DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
1ff636
 	-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
1ff636
 	-I $(top_srcdir)/src \
1ff636
 	-I $(top_builddir)/src/shared \
1ff636
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
1ff636
index 64a384b..175be68 100644
1ff636
--- a/src/bootchart/bootchart.c
1ff636
+++ b/src/bootchart/bootchart.c
1ff636
@@ -76,7 +76,7 @@ int sysfd=-1;
1ff636
 #define DEFAULT_HZ 25.0
1ff636
 #define DEFAULT_SCALE_X 100.0 /* 100px = 1sec */
1ff636
 #define DEFAULT_SCALE_Y 20.0  /* 16px = 1 process bar */
1ff636
-#define DEFAULT_INIT ROOTLIBDIR "/systemd/systemd"
1ff636
+#define DEFAULT_INIT ROOTLIBEXECDIR "/systemd"
1ff636
 #define DEFAULT_OUTPUT "/run/log"
1ff636
 
1ff636
 /* graph defaults */