localnet: Set FQDN without using domainname command

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/initscripts/system/localnet b/src/initscripts/system/localnet
index 97f4d381c985b5df45c0aef3bf4791dfd8101984..a16b32e46df665afaed12ed1dad04be649aec85a 100644 (file)
--- a/src/initscripts/system/localnet
+++ b/src/initscripts/system/localnet
@@ -36,16 +36,10 @@ case "${1}" in
                ip link set lo up
                evaluate_retval
 
-               boot_mesg "Setting hostname to ${HOSTNAME}..."
-               hostname "${HOSTNAME}"
+               boot_mesg "Setting hostname to ${HOSTNAME}.${DOMAINNAME}..."
+               hostname "${HOSTNAME}.${DOMAINNAME}"
                evaluate_retval
 
-               if [ -n "${DOMAINNAME}" ]; then
-                       boot_mesg "Setting domainname to ${DOMAINNAME}..."
-                       domainname "${DOMAINNAME}"
-                       evaluate_retval
-               fi
-
                # Update hosts
                write_hosts