Alten PCMCIA Code aus dem Installer entfernt.

[ipfire-2.x.git] / src / initscripts / init.d / localnet

diff --git a/src/initscripts/init.d/localnet b/src/initscripts/init.d/localnet
index 4e5010229dfd3dc1107afaec59deebd207a9f591..91c9e1f4d702eff742eff3500f1faa63739d73c4 100644 (file)
--- a/src/initscripts/init.d/localnet
+++ b/src/initscripts/init.d/localnet
@@ -14,17 +14,21 @@
 
 . /etc/sysconfig/rc
 . ${rc_functions}
-. /etc/sysconfig/network
 
 case "${1}" in
        start)
+               eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
                boot_mesg "Bringing up the loopback interface..."
                ip addr add 127.0.0.1/8 label lo dev lo
                ip link set lo up
                evaluate_retval
 
                boot_mesg "Setting hostname to ${HOSTNAME}..."
-               hostname ${HOSTNAME}
+               if [ -z "$DOMAINNAME" ]; then
+                       hostname ${HOSTNAME}
+               else
+                       hostname ${HOSTNAME}.${DOMAINNAME}
+               fi
                evaluate_retval
                ;;
 
@@ -41,6 +45,7 @@ case "${1}" in
                ;;
 
        status)
+               eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
                echo "Hostname is: $(hostname)"
                ip link show lo
                ;;