You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.4 KiB
41 lines
1.4 KiB
From 685ddafd9e3c5f548e02e38633f366ff453f918b Mon Sep 17 00:00:00 2001 |
|
From: Martin Pitt <martin.pitt@ubuntu.com> |
|
Date: Tue, 24 Feb 2015 14:30:10 +0100 |
|
Subject: [PATCH] bootchart: fix default init path |
|
|
|
Commit 6e1bf7ab99 used the wrong directory; we need rootlibexecdir, not |
|
rootlibdir, as the latter is something like /lib/x86_64-linux-gnu/ on |
|
multi-arch systems. |
|
|
|
https://launchpad.net/bugs/1423867 |
|
(cherry picked from commit a804d849b3c2199bc25d1d4e65fc119fa4d7d0e2) |
|
--- |
|
Makefile.am | 1 + |
|
src/bootchart/bootchart.c | 2 +- |
|
2 files changed, 2 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/Makefile.am b/Makefile.am |
|
index bf65b24060..2e6455f6e3 100644 |
|
--- a/Makefile.am |
|
+++ b/Makefile.am |
|
@@ -199,6 +199,7 @@ AM_CPPFLAGS = \ |
|
-DKEXEC=\"$(KEXEC)\" \ |
|
-DLIBDIR=\"$(libdir)\" \ |
|
-DROOTLIBDIR=\"$(rootlibdir)\" \ |
|
+ -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ |
|
-DTEST_DIR=\"$(abs_top_srcdir)/test\" \ |
|
-I $(top_srcdir)/src \ |
|
-I $(top_builddir)/src/shared \ |
|
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c |
|
index 64a384bacf..175be68688 100644 |
|
--- a/src/bootchart/bootchart.c |
|
+++ b/src/bootchart/bootchart.c |
|
@@ -76,7 +76,7 @@ int sysfd=-1; |
|
#define DEFAULT_HZ 25.0 |
|
#define DEFAULT_SCALE_X 100.0 /* 100px = 1sec */ |
|
#define DEFAULT_SCALE_Y 20.0 /* 16px = 1 process bar */ |
|
-#define DEFAULT_INIT ROOTLIBDIR "/systemd/systemd" |
|
+#define DEFAULT_INIT ROOTLIBEXECDIR "/systemd" |
|
#define DEFAULT_OUTPUT "/run/log" |
|
|
|
/* graph defaults */
|
|
|