diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-04-18 14:16:08 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2011-04-18 14:16:08 -0400 |
| commit | 3c38f904f831f02d5f5c28f431ca86d9877697f1 (patch) | |
| tree | 98e456d2c3979d7239c5307d51a6c6beb59c705f | |
| parent | b4bdede8b55b39467ee96da8d4e72dadd4e269ba (diff) | |
| download | initscripts-3c38f904f831f02d5f5c28f431ca86d9877697f1.tar initscripts-3c38f904f831f02d5f5c28f431ca86d9877697f1.tar.gz initscripts-3c38f904f831f02d5f5c28f431ca86d9877697f1.tar.bz2 initscripts-3c38f904f831f02d5f5c28f431ca86d9877697f1.tar.xz initscripts-3c38f904f831f02d5f5c28f431ca86d9877697f1.zip | |
Support overriding hostname via /etc/hostname.
| -rwxr-xr-x | rc.d/rc.sysinit | 3 | ||||
| -rw-r--r-- | sysconfig.txt | 1 | ||||
| -rwxr-xr-x | systemd/fedora-configure | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 6067ea88..561e99e8 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -12,6 +12,9 @@ set -m if [ -f /etc/sysconfig/network ]; then . /etc/sysconfig/network fi +if [ -r /etc/hostname ]; then + HOSTNAME=$(cat /etc/hostname) +fi if [ -z "$HOSTNAME" -o "$HOSTNAME" = "(none)" ]; then HOSTNAME=localhost fi diff --git a/sysconfig.txt b/sysconfig.txt index 58a37e1a..6a3c3b57 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -186,6 +186,7 @@ Generic options: NETWORKING=yes|no HOSTNAME=<fqdn by default, but whatever hostname you want> + Note that this can be overriden by /etc/hostname. GATEWAY=<gateway IP> GATEWAYDEV=<gateway device to use, when multiple devices have GATEWAY=> (e.g. eth0) NISDOMAIN=<nis domain name> diff --git a/systemd/fedora-configure b/systemd/fedora-configure index e6779fed..d1e4dbd3 100755 --- a/systemd/fedora-configure +++ b/systemd/fedora-configure @@ -15,6 +15,7 @@ fi # Reread in network configuration data. if [ -f /etc/sysconfig/network ]; then . /etc/sysconfig/network + [ -r /etc/hostname ] && HOSTNAME=$(cat /etc/hostname) # Reset the hostname. action $"Resetting hostname ${HOSTNAME}: " hostname ${HOSTNAME} |