summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorJan Synacek <jsynacek@redhat.com>2019-04-25 12:19:16 +0200
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>2019-12-05 15:50:41 +0100
commit613a02b7d67864af1860e9137e2ee101d603463e (patch)
tree295728ebc1510f551839fd723ef0179c695ad5cd /man
parentcb084637ba1c8558f1538ce300c5520a6764dc76 (diff)
downloadsystemd-613a02b7d67864af1860e9137e2ee101d603463e.tar.gz
debug-generator: enable custom systemd.debug_shell ttyv239-20
(cherry picked from commit 93912e872fb14e9c372e090409e429084a6450f5) Resolves: #1723722
Diffstat (limited to 'man')
-rw-r--r--man/custom-entities.ent.in1
-rw-r--r--man/systemd-debug-generator.xml13
2 files changed, 10 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 fa88e8ac01..25d8b1a873 100644
--- a/man/systemd-debug-generator.xml
+++ b/man/systemd-debug-generator.xml
@@ -1,6 +1,10 @@
<?xml version="1.0"?>
<!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % entities SYSTEM "custom-entities.ent" >
+%entities;
+]>
<!--
SPDX-License-Identifier: LGPL-2.1+
-->
@@ -57,9 +61,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