summaryrefslogtreecommitdiff
path: root/man/kernel-command-line.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2023-01-05 15:35:20 +0100
committerLennart Poettering <lennart@poettering.net>2023-01-05 18:52:15 +0100
commit116687f26778c5d8f1fceb9b0ebba363a10597bc (patch)
tree3514cb8fb28d72896aa6b5434486e4a39b3c23de /man/kernel-command-line.xml
parentea575e176aac9fa8f430bb30a3e8abd8da767a10 (diff)
downloadsystemd-116687f26778c5d8f1fceb9b0ebba363a10597bc.tar.gz
resolved: read DNS conf also from creds and kernel cmdline
Note that this drops ProtectProc=invisible from systemd-resolved.service. This is done because othewise access to the booted "kernel" command line is not necessarily available. That's because in containers we want to read /proc/1/cmdline for that. Fixes: #24103
Diffstat (limited to 'man/kernel-command-line.xml')
-rw-r--r--man/kernel-command-line.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 545dc40798..0528c4b672 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -479,6 +479,15 @@
</varlistentry>
<varlistentry>
+ <term><varname>nameserver=</varname></term>
+ <term><varname>domain=</varname></term>
+
+ <listitem><para>Configures DNS server information and search domains, see
+ <citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ for details.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><varname>resume=</varname></term>
<term><varname>resumeflags=</varname></term>