diff options
| author | Jan Synacek <jsynacek@redhat.com> | 2019-04-25 12:19:16 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-07-02 09:51:27 +0200 |
| commit | 93912e872fb14e9c372e090409e429084a6450f5 (patch) | |
| tree | 4b8eedffbb710921ecc78e3e10cd45df98097b65 /man | |
| parent | Merge pull request #12912 from yuwata/network-move-functions (diff) | |
| download | systemd-93912e872fb14e9c372e090409e429084a6450f5.tar.xz systemd-93912e872fb14e9c372e090409e429084a6450f5.zip | |
debug-generator: enable custom systemd.debug_shell tty
Diffstat (limited to 'man')
| -rw-r--r-- | man/custom-entities.ent.in | 1 | ||||
| -rw-r--r-- | man/systemd-debug-generator.xml | 12 |
2 files changed, 9 insertions, 4 deletions
diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in index e2bd44e5e7..85805777a0 100644 --- a/man/custom-entities.ent.in +++ b/man/custom-entities.ent.in @@ -8,3 +8,4 @@ <!ENTITY CERTIFICATE_ROOT @CERTIFICATE_ROOT@> <!ENTITY MEMORY_ACCOUNTING_DEFAULT @MEMORY_ACCOUNTING_DEFAULT_YES_NO@> <!ENTITY KILL_USER_PROCESSES @KILL_USER_PROCESSES_YES_NO@> +<!ENTITY DEBUGTTY @DEBUGTTY@> diff --git a/man/systemd-debug-generator.xml b/man/systemd-debug-generator.xml index 1f9a79db82..305dc2ff37 100644 --- a/man/systemd-debug-generator.xml +++ b/man/systemd-debug-generator.xml @@ -1,7 +1,10 @@ <?xml version="1.0"?> <!--*-nxml-*--> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ +<!ENTITY % entities SYSTEM "custom-entities.ent" > +%entities; +]> <!-- SPDX-License-Identifier: LGPL-2.1+ --> <refentry id="systemd-debug-generator"> @@ -56,9 +59,10 @@ <option>rd.systemd.debug_shell</option> option is specified, the debug shell service <literal>debug-shell.service</literal> is pulled into the boot - transaction. It will spawn a debug shell on tty9 during early - system startup. Note that the shell may also be turned on - persistently by enabling it with + transaction and a debug shell will be spawned during early boot. + By default, <filename>&DEBUGTTY;</filename> is used, but a specific tty can also be set, + either with or without the <filename>/dev/</filename> prefix. + Note that the shell may also be turned on persistently by enabling it with <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s <command>enable</command> command. <option>rd.systemd.debug_shell=</option> is honored only by initial |