picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: read "debug" from kernel commandline and set log level

This commit is contained in:
Lukas Nykryn 2013-05-29 14:09:56 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 23ad4dd884
commit 9749cd77bc
4 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@ -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

12
man/kernel-command-line.xml
View File

@ -110,6 +110,18 @@
</listitem>
</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>

23
man/systemd.xml
View File

@ -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>

2
src/core/main.c
View File

@ -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;