diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2015-02-02 15:48:40 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-02-02 17:40:35 +0100 |
| commit | 6e1bf7ab998e30b23202192b5b47c119e7a3697d (patch) | |
| tree | ed1fe7ff1463e5d1f06b947ca3439434d94672d4 | |
| parent | bca81be7755d15e7369d764bfa94a7ca6c595c76 (diff) | |
bootchart: Ensure that systemd is the init called after using bootchart
When booting with systemd-bootchart, default to call the systemd binary
rather than the init binary on disk, which might be another init system.
Collecting data only works with booting systemd.
| -rw-r--r-- | man/bootchart.conf.xml | 2 | ||||
| -rw-r--r-- | man/systemd-bootchart.xml | 4 | ||||
| -rw-r--r-- | src/bootchart/bootchart.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/man/bootchart.conf.xml b/man/bootchart.conf.xml index a364826bb0..e11ccb52f6 100644 --- a/man/bootchart.conf.xml +++ b/man/bootchart.conf.xml @@ -124,7 +124,7 @@ <varlistentry> <term><varname>Init=[path]</varname></term> <listitem><para>Configures bootchart to run a non-standard - binary instead of <filename>/sbin/init</filename>. This + binary instead of <filename>/usr/lib/systemd/systemd</filename>. This option is only relevant if bootchart was invoked from the kernel command line with init=/usr/lib/systemd/systemd-bootchart.</para></listitem> diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml index 0068e928a5..ff86be2ad8 100644 --- a/man/systemd-bootchart.xml +++ b/man/systemd-bootchart.xml @@ -116,7 +116,7 @@ <command>systemd-bootchart</command> instead of the init process. In turn, <command>systemd-bootchart</command> - will invoke <command>/sbin/init</command>. + will invoke <command>/usr/lib/systemd/systemd</command>. </para></listitem> </varlistentry> @@ -218,7 +218,7 @@ <term><option>-i</option></term> <term><option>--init <replaceable>path</replaceable></option></term> <listitem><para>Use this init binary. Defaults to - <command>/sbin/init</command>. + <command>/usr/lib/systemd/systemd</command>. </para></listitem> </varlistentry> diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index 0808ba44ea..b49e2c9235 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 "/sbin/init" +#define DEFAULT_INIT ROOTLIBDIR "/systemd/systemd" #define DEFAULT_OUTPUT "/run/log" /* graph defaults */ @@ -326,7 +326,7 @@ int main(int argc, char *argv[]) { /* * If the kernel executed us through init=/usr/lib/systemd/systemd-bootchart, then * fork: - * - parent execs executable specified via init_path[] (/sbin/init by default) as pid=1 + * - parent execs executable specified via init_path[] (/usr/lib/systemd/systemd by default) as pid=1 * - child logs data */ if (getpid() == 1) { |