Merge branch 'master' into next

[people/mfischer/ipfire-2.x.git] / src / initscripts / system / localnet

diff --git a/src/initscripts/system/localnet b/src/initscripts/system/localnet
index 97f4d381c985b5df45c0aef3bf4791dfd8101984..f260a1f29d71718d9b3172bc511dba1049b3b2c3 100644 (file)
--- a/src/initscripts/system/localnet
+++ b/src/initscripts/system/localnet
@@ -1,16 +1,23 @@
 #!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/localnet
-#
-# Description : Loopback device
-#
-# Authors     : Gerard Beekmans  - gerard@linuxfromscratch.org
-#
-# Version     : 00.00
-#
-# Notes       :
-#
-########################################################################
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program 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 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
 . /etc/sysconfig/rc
 . ${rc_functions}
@@ -19,6 +26,7 @@ write_resolv_conf() {
        (
                [ -n "${DOMAINNAME}" ] && echo "search ${DOMAINNAME}"
                echo "nameserver 127.0.0.1"
+               echo "options trust-ad"
        ) > /etc/resolv.conf
 }
 
@@ -36,16 +44,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
 
@@ -76,5 +78,3 @@ case "${1}" in
                exit 1
                ;;
 esac
-
-# End $rc_base/init.d/localnet