X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-networking.sh;h=92c66ee4849b1f1c87d66de841fda2f0e6210fe3;hb=b4113785beb7ac5d2c8689d16b9517eafd4e8890;hp=9cc367442b91f31c2d1f384b73175266352efc20;hpb=1eda797fd6bb47eb180d4a1d8e684aa55bff5911;p=live-boot-grml.git

diff --git a/components/9990-networking.sh b/components/9990-networking.sh
index 9cc3674..92c66ee 100755
--- a/components/9990-networking.sh
+++ b/components/9990-networking.sh
@@ -128,9 +128,17 @@ do_netsetup ()
 
 		if [ -n "${interface}" ]
 		then
+			# HWADDR used by do_iscsi from 9990-mount-iscsi.sh
+			# shellcheck disable=SC2034
 			HWADDR="$(cat "/sys/class/net/${interface}/address")"
 		fi
 
+		if [ ! -e "/etc/hostname" ] && [ -n "${HOSTNAME}" ]
+		then
+			echo "Creating /etc/hostname"
+			echo "${HOSTNAME}" > /etc/hostname
+		fi
+
 		# Only create /etc/hosts if FQDN is known (to let 'hostname -f' query
 		# this file). Otherwise DNS will be queried to determine the FQDN.
 		if [ ! -e "/etc/hosts" ] && [ -n "${DNSDOMAIN}" ]
@@ -154,7 +162,6 @@ EOF
 			if [ -n "${DNSDOMAIN}" ]
 			then
 				echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
-				echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
 			fi
 
 			for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1} ${DNSSERVERS}
@@ -164,6 +171,14 @@ EOF
 					echo "nameserver $i" >> /etc/resolv.conf
 				fi
 			done
+
+			if [ -n "${DOMAINSEARCH}" ]
+			then
+				echo "search ${DOMAINSEARCH}" >> /etc/resolv.conf
+			elif [ -n "${DNSDOMAIN}" ]
+			then
+				echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
+			fi
 		fi
 
 		# Check if we have a network device at all