X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fhostname.xml;h=2f949dedd3b5d71a5ccaf8494f648507a52f0bf2;hb=48aae6d6a051acd9c0630fab1e79b82c847e538b;hp=1acda1af5d24df060174b51df6688bd14601f08f;hpb=63c52e45de6b6071d64cc4d3bb0d47357a1f5ead;p=elogind.git
diff --git a/man/hostname.xml b/man/hostname.xml
index 1acda1af5..2f949dedd 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 hostname configuration file
@@ -56,20 +56,28 @@
The /etc/hostname file
configures the name of the local system that is set
- during boot, with the
+ during boot using the
sethostname2
system call. It should contain a single
- 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 lower-case characters and no spaces or dots,
+ newline-terminated hostname string. The
+ hostname may be a free-form string up to 64 characters
+ in length; however, it is recommended that it consists
+ only of 7-bit 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
strict requirement.
- Depending on the operating system other
+ Depending on the operating system, other
configuration files might be checked for configuration
- of the host name as well, however only as fallback.
+ of the hostname as well, however only as fallback.
+
+ You may use
+ hostnamectl1
+ to change the value of this file during runtime from
+ the command line. Use
+ systemd-firstboot1
+ to initialize it on mounted (but not booted) system
+ images.
@@ -88,7 +96,10 @@
hostname1,
hostname7,
machine-id5,
- machine-info5
+ machine-info5,
+ hostnamectl1,
+ systemd-hostnamed.service8,
+ systemd-firstboot1