X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Fhelper%2Fexoscale-setup;fp=src%2Finitscripts%2Fhelper%2Fexoscale-setup;h=24e98d38bab773b170107502bb8474433b9a8268;hp=59859a6e92ff5a9ccc8f3398711fc4763c196283;hb=df8920100d8e853f28e3b9aa29182596a79dc129;hpb=898d6d87a2ab7076d31ba270529807cca4dc0284

diff --git a/src/initscripts/helper/exoscale-setup b/src/initscripts/helper/exoscale-setup
index 59859a6e92..24e98d38ba 100644
--- a/src/initscripts/helper/exoscale-setup
+++ b/src/initscripts/helper/exoscale-setup
@@ -33,10 +33,13 @@ import_exoscale_configuration() {
 
 	# Set domainname
 	if ! grep -q "^DOMAINNAME=" /var/ipfire/main/settings; then
-		local domainname="${hostname#*.}"
+		local domainname="localdomain"
 
-		# Fall back to localdomain
-		[ -z "${domainname}" ] && domainname="localdomain"
+		# If the hostname contains a dot we strip the last
+		# part and use it as our domain name
+		if [[ ${hostname} =~ "\." ]]; then
+			domainname="${hostname#*.}"
+		fi
 
 		echo "DOMAINNAME=${domainname}" >> /var/ipfire/main/settings
 	fi