Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

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
 

src/initscripts/system/static-routes

@@ -42,7 +42,7 @@ function create_all_routes() {
 CONFIGFILE="/var/ipfire/main/routing"
 
 case "${1}" in
-	start)
+	start|reload)
 		boot_mesg "Adding static routes..."
 
 		# First, initialize the table
@@ -61,7 +61,7 @@ case "${1}" in
 		;;
 
 	*)
-		echo "Usage: ${0} {start|stop}"
+		echo "Usage: ${0} {start|stop|reload}"
 		exit 1
 		;;
 esac