X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fhostname.xml;h=f89332e983a83739125d133e70bac16be47f6be6;hb=795607b22308f5b92073b012e43be1892fdd97c0;hp=f226ef05ad0be819b8c601f33c33dfac3c264882;hpb=eeca220bc280ebbed98bb3fc2c8d63efeccbfca1;p=elogind.git
diff --git a/man/hostname.xml b/man/hostname.xml
index f226ef05a..f89332e98 100644
--- a/man/hostname.xml
+++ b/man/hostname.xml
@@ -9,22 +9,22 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
- /etc/hostname
+ hostname
systemd
@@ -44,7 +44,7 @@
hostname
- local host name configuration file
+ Local host name configuration file
@@ -62,14 +62,19 @@
newline-terminated host name string. The
host name may be a free-form string up to 64 characters
in length, however it is recommended that it consists
- only of 7bit ASCII characters and no spaces or dots,
- and limit itself to the format allowed for DNS domain
+ only of 7bit ASCII lower-case characters and no spaces or dots,
+ and limits itself to the format allowed for DNS domain
name labels, even though this is not a
- requirement.
+ strict requirement.
Depending on the operating system other
configuration files might be checked for configuration
of the host name as well, however only as fallback.
+
+ You may use
+ hostnamectl1
+ to change the value of this file from the command
+ line.
@@ -85,7 +90,12 @@
systemd1,
sethostname2,
- hostname1
+ hostname1,
+ hostname7,
+ machine-id5,
+ machine-info5,
+ hostnamectl1,
+ systemd-hostnamed.service8