From: Zbigniew Jędrzejewski-Szmek Date: Mon, 20 Feb 2017 01:02:12 +0000 (-0500) Subject: man: update descriptions of argument-less kernel cmdline args X-Git-Tag: v233~41^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=770c4777c92c2c2b5763348135719478f36c3616;p=thirdparty%2Fsystemd.git man: update descriptions of argument-less kernel cmdline args This updates the man page for the changes introduced in 1d84ad944520fc3e062ef518c4db4e1d3a1866af. "=" is kep if the option is predominantly used with an argument, and dropped otherwise. v2: - update also description of log_color - drop '=' in all cases where it is optional (previous rule of dropping it only in some cases was just too arbitrary.) --- diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index f9ce4e0c69d..f02ca3e7bc9 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -78,16 +78,16 @@ systemd.unit= rd.systemd.unit= - systemd.dump_core= - systemd.crash_chvt= - systemd.crash_shell= - systemd.crash_reboot= - systemd.confirm_spawn= - systemd.show_status= + systemd.dump_core + systemd.crash_chvt + systemd.crash_shell + systemd.crash_reboot + systemd.confirm_spawn + systemd.show_status systemd.log_target= systemd.log_level= - systemd.log_color= systemd.log_location= + systemd.log_color systemd.default_standard_output= systemd.default_standard_error= systemd.setenv= diff --git a/man/systemd.xml b/man/systemd.xml index c6f26131395..bc1563d5e14 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -51,10 +51,13 @@ - systemd OPTIONS + systemd + OPTIONS - init OPTIONS COMMAND + init + OPTIONS + COMMAND @@ -150,6 +153,7 @@ user instance. This setting may also be enabled during boot, on the kernel command line via the systemd.crash_vt= option, see + below. @@ -898,88 +902,91 @@ - systemd.dump_core= + systemd.dump_core - Takes a boolean argument. If - , the systemd manager (PID 1) dumps core - when it crashes. Otherwise, no core dump is created. Defaults - to . + Takes a boolean argument or enables the option if specified + without an argument. If enabled, the systemd manager (PID 1) dumps core when + it crashes. Otherwise, no core dump is created. Defaults to enabled. + - systemd.crash_chvt= + systemd.crash_chvt - Takes a positive integer, or a boolean - argument. If a positive integer (in the range 1–63) is - specified, the system manager (PID 1) will activate the specified - virtual terminal (VT) when it crashes. Defaults to - no, meaning that no such switch is - attempted. If set to yes, the VT the - kernel messages are written to is selected. + Takes a positive integer, or a boolean argument. Can be also + specified without an argument, with the same effect as a positive boolean. If + a positive integer (in the range 1–63) is specified, the system manager (PID + 1) will activate the specified virtual terminal (VT) when it + crashes. Defaults to disabled, meaning that no such switch is attempted. If + set to enabled, the VT the kernel messages are written to is selected. + - systemd.crash_shell= + systemd.crash_shell - Takes a boolean argument. If - , the system manager (PID 1) spawns a - shell when it crashes, after a 10s delay. Otherwise, no shell - is spawned. Defaults to , for security - reasons, as the shell is not protected by password + Takes a boolean argument or enables the option if specified + without an argument. If enabled, the system manager (PID 1) spawns a shell + when it crashes, after a 10s delay. Otherwise, no shell is spawned. Defaults + to disabled, for security reasons, as the shell is not protected by password authentication. - systemd.crash_reboot= + systemd.crash_reboot - Takes a boolean argument. If - , the system manager (PID 1) will reboot - the machine automatically when it crashes, after a 10s delay. - Otherwise, the system will hang indefinitely. Defaults to - , in order to avoid a reboot loop. If - combined with systemd.crash_shell=, the + Takes a boolean argument or enables the option if specified + without an argument. If enabled, the system manager (PID 1) will reboot the + machine automatically when it crashes, after a 10s delay. Otherwise, the + system will hang indefinitely. Defaults to disabled, in order to avoid a + reboot loop. If combined with systemd.crash_shell, the system is rebooted after the shell exits. - systemd.confirm_spawn= + systemd.confirm_spawn - Takes a boolean argument or a path to the - virtual console where the confirmation messages should be - emitted. If , the system manager (PID 1) - asks for confirmation when spawning processes using - . If a path or a console name - (such as ttyS0) is provided, the virtual - console pointed to by this path or described by the give name - will be used instead. Defaults to . + Takes a boolean argument or a path to the virtual console + where the confirmation messages should be emitted. Can be also specified + without an argument, with the same effect as a positive boolean. If enabled, + the system manager (PID 1) asks for confirmation when spawning processes + using . If a path or a console name (such as + ttyS0) is provided, the virtual console pointed to by this + path or described by the give name will be used instead. Defaults to disabled. + - systemd.show_status= + systemd.show_status - Takes a boolean argument or the constant auto. If , - the systemd manager (PID 1) shows terse service status updates on the console during bootup. - auto behaves like until a unit fails or there is a significant - delay in boot. Defaults to , unless is passed as kernel command - line option, in which case it defaults to auto. If specified overrides the system manager - configuration file option , see - systemd-system.conf5. However, - the process command line option takes precedence over both this kernel command - line option and the configuration file option. + Takes a boolean argument or the constant + auto. Can be also specified without an argument, with + the same effect as a positive boolean. If enabled, the systemd manager (PID + 1) shows terse service status updates on the console during bootup. + auto behaves like until a unit + fails or there is a significant delay in boot. Defaults to enabled, unless + is passed as kernel command line option, in which case + it defaults to auto. If specified overrides the system + manager configuration file option , see + systemd-system.conf5. + However, the process command line option + takes precedence over both this kernel command line option and the + configuration file option. systemd.log_target= systemd.log_level= - systemd.log_color= systemd.log_location= + systemd.log_color - Controls log output, with the same effect as - the $SYSTEMD_LOG_TARGET, + Controls log output, with the same effect as the + $SYSTEMD_LOG_TARGET, $SYSTEMD_LOG_LEVEL, - $SYSTEMD_LOG_COLOR, - $SYSTEMD_LOG_LOCATION environment variables - described above. + $SYSTEMD_LOG_LOCATION, + $SYSTEMD_LOG_COLOR environment variables described above. + systemd.log_color can be specified without an argument, + with the same effect as a positive boolean.