bootchart defaults to chaining to /sbin/init, which is sensible,
but in a pure systemd environment (without systemd-sysvinit)
will make the machine unbootable.
Change the default through /etc/systemd/bootchart.conf.
Keep the /sbin/init default in the source code, in case
some users rely on that.
---
Updated to take the path from autotools.
Makefile.am | 12 +++++++-----
src/bootchart/.gitignore | 1 +
src/bootchart/{bootchart.conf => bootchart.conf.in} | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
create mode 100644 src/bootchart/.gitignore
rename src/bootchart/{bootchart.conf => bootchart.conf.in} (95%)
diff --git a/Makefile.am b/Makefile.am
index e1e0843..6be5c4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4624,23 +4624,25 @@ systemd_bootchart_LDADD = \
libsystemd-shared.la
rootlibexec_PROGRAMS += \
systemd-bootchart
-dist_pkgsysconf_DATA += \
+nodist_pkgsysconf_DATA += \
src/bootchart/bootchart.conf
nodist_systemunit_DATA += \
units/systemd-bootchart.service
+CLEANFILES += \
+ src/bootchart/bootchart.conf \
+ units/systemd-bootchart.service
+endif
+
EXTRA_DIST += \
+ src/bootchart/bootchart.conf.in \
units/systemd-bootchart.service.in
-CLEANFILES += \
- units/systemd-bootchart.service
-endif
-
#
------------------------------------------------------------------------------
if ENABLE_QUOTACHECK
rootlibexec_PROGRAMS += \
systemd-quotacheck
diff --git a/src/bootchart/.gitignore b/src/bootchart/.gitignore
new file mode 100644
index 0000000..371b43b
--- /dev/null
+++ b/src/bootchart/.gitignore
@@ -0,0 +1 @@
+/bootchart.conf
diff --git a/src/bootchart/bootchart.conf b/src/bootchart/bootchart.conf.in
similarity index 95%
rename from src/bootchart/bootchart.conf
rename to src/bootchart/bootchart.conf.in
index c73328f..08e7071 100644
--- a/src/bootchart/bootchart.conf
+++ b/src/bootchart/bootchart.conf.in
@@ -14,11 +14,11 @@
#Samples=500
#Frequency=25
#Relative=no
#Filter=yes
#Output=<folder name, defaults to /run/log>
-#Init=/path/to/init-binary
+Init=@rootlibexecdir@/systemd
#PlotMemoryUsage=no
#PlotEntropyGraph=no
#ScaleX=100
#ScaleY=20
#ControlGroup=no
--
2.2.0.71.g3365589
_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
