diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-08-06 07:58:50 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-08-06 07:59:34 +0200 |
commit | cad8d67194314354befbdf84bb04f91cbc26b75f (patch) | |
tree | 9832581ab59680ac86008f4382b51b4aeab22425 /man/systemd.network.xml | |
parent | 685499007fc536f5e78ebb49cb67561e186f665e (diff) | |
parent | 10c6e7e51ec515a509698120ea13cb2e0a325a3a (diff) | |
download | systemd-cad8d67194314354befbdf84bb04f91cbc26b75f.tar.gz |
Merge pull request #9775 from yuwata/follow-up-9766
Diffstat (limited to 'man/systemd.network.xml')
-rw-r--r-- | man/systemd.network.xml | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 8a80b0cf4f..cbf53f323a 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -1194,25 +1194,28 @@ <varlistentry> <term><varname>SendHostname=</varname></term> <listitem> - <para>When true (the default), the machine's hostname will - be sent to the DHCP server.</para> + <para>When true (the default), the machine's hostname will be sent to the DHCP server. + Note that the machine's hostname must consist only of 7-bit ASCII lower-case characters and + no spaces or dots, and be formatted as a valid DNS domain name. Otherwise, the hostname is not + sent even if this is set to true.</para> </listitem> </varlistentry> <varlistentry> <term><varname>UseHostname=</varname></term> <listitem> <para>When true (the default), the hostname received from - the DHCP server will be set as the transient hostname of the system + the DHCP server will be set as the transient hostname of the system. </para> </listitem> </varlistentry> <varlistentry> - <term><varname>Hostname=</varname></term> - <listitem> - <para>Use this value for the hostname which is sent to the - DHCP server, instead of machine's hostname.</para> - </listitem> - </varlistentry> + <term><varname>Hostname=</varname></term> + <listitem> + <para>Use this value for the hostname which is sent to the DHCP server, instead of machine's hostname. + Note that the specified hostname must consist only of 7-bit ASCII lower-case characters and + no spaces or dots, and be formatted as a valid DNS domain name.</para> + </listitem> + </varlistentry> <varlistentry> <term><varname>UseDomains=</varname></term> <listitem> |