diff options
author | Martin Pitt <martin.pitt@ubuntu.com> | 2015-05-19 07:49:56 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-05-19 12:18:08 +0200 |
commit | 139e5336286c37d9d4a2df01931ba0a86abbac69 (patch) | |
tree | 3edcfb5098607cca83f3139260002e5a545152ae /man | |
parent | e861098bf22d8e65c3b2589e7ca056e720a06483 (diff) |
hostname: Allow comments in /etc/hostname
The hostname(1) tool allows comments in /etc/hostname. Introduce a new
read_hostname_config() in hostname-util which reads a hostname configuration
file like /etc/hostname, strips out comments, whitespace, and cleans the
hostname. Use it in hostname-setup.c and hostnamed and remove duplicated code.
Update hostname manpage. Add tests.
https://launchpad.net/bugs/1053048
Diffstat (limited to 'man')
-rw-r--r-- | man/hostname.xml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/man/hostname.xml b/man/hostname.xml index 5d3d46d8ce..9688450e1c 100644 --- a/man/hostname.xml +++ b/man/hostname.xml @@ -57,11 +57,12 @@ name of the local system that is set during boot using the <citerefentry><refentrytitle>sethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry> system call. It should contain a single 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.</para> + hostname string. Comments (lines starting with a `#') are ignored. + 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.</para> <para>Depending on the operating system, other configuration files might be checked for configuration of the hostname as well, |