diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2013-05-29 14:09:56 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-05-30 00:43:39 -0400 |
| commit | 9749cd77bc6121a304a7f1eb0f03f26e620dc9da (patch) | |
| tree | cc7062d97f97ef50bba039646efec57091943593 | |
| parent | 23ad4dd8844c582929115a11ed2830a1371568d6 (diff) | |
core: read "debug" from kernel commandline and set log level
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | man/kernel-command-line.xml | 12 | ||||
| -rw-r--r-- | man/systemd.xml | 23 | ||||
| -rw-r--r-- | src/core/main.c | 2 |
4 files changed, 32 insertions, 8 deletions
@@ -56,9 +56,6 @@ Features: complain loudly if they have argv[0][0] == '@' set. https://bugzilla.redhat.com/show_bug.cgi?id=961044 -* read the kernel's console "debug" keyword like we read "quiet" and adjust: - systemd.log_level=debug and maybe systemd.log_target=kmsg - * add an option to nspawn that uses seccomp to make socket(AF_NETLINK, SOCK_RAW, NETLINK_AUDIT) fail the the appropriate error code that makes the audit userspace to think auditing is not available in the diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index 7ff2709fbd..db5d38a741 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -111,6 +111,18 @@ </varlistentry> <varlistentry> + <term><varname>debug</varname></term> + <listitem> + <para>Parameter understood by + both the kernel and the system + and service manager to control + console log verbosity. For + details see + <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para> + </listitem> + </varlistentry> + + <varlistentry> <term><varname>emergency</varname></term> <term><varname>single</varname></term> <term><varname>s</varname></term> diff --git a/man/systemd.xml b/man/systemd.xml index d009ed8e1c..497dd2bfee 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -1114,15 +1114,28 @@ <varlistentry> <term><varname>quiet</varname></term> - <listitem><para>If passed turns off + <listitem><para>Turn off status output at boot, much like <varname>systemd.show_status=false</varname> would. Note that this option is also read by the kernel itself and disables - kernel log output to the - kernel. Passing this option hence - turns off the usual output from both - the system manager and the + kernel log output. Passing this option + hence turns off the usual output from + both the system manager and the kernel. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><varname>debug</varname></term> + + <listitem><para>Turn on debugging + output. This is equivalent to + <varname>systemd.log_level=debug</varname>. + Note that this option is also read by + the kernel itself and enables kernel + debug output. Passing this option + hence turns on the debug output from + both the system manager and the kernel.</para></listitem> </varlistentry> diff --git a/src/core/main.c b/src/core/main.c index bf1e3e8ffa..bb7364054e 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -410,6 +410,8 @@ static int parse_proc_cmdline_word(const char *word) { } else if (streq(word, "quiet")) arg_show_status = false; + else if (streq(word, "debug")) + log_set_max_level(LOG_DEBUG); else if (!in_initrd()) { unsigned i; |