Index: etc/rc.d/hostname
===================================================================
--- etc/rc.d/hostname
+++ etc/rc.d/hostname
@@ -33,22 +33,22 @@
 . /etc/rc.subr
 . /etc/network.subr
 
-name="hostname"
-start_cmd="hostname_start"
-stop_cmd=":"
+name=hostname
+
+load_rc_config $name
+
+start_cmd=hostname_start
+stop_cmd=:
 
 hostname_start()
 {
-	# If we are not inside a jail, set the host name if it is not already set.
-	# If we are inside a jail, set the host name even if it is already set,
-	# but first check if it is permitted.
+	# If we are not inside a jail, set the host name.
+	# If we are inside a jail, set the host name if it is permitted.
 	#
 	if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then
 		if [ `$SYSCTL_N security.jail.set_hostname_allowed` -eq 0 ]; then
 			return
 		fi
-	elif [ -n "`/bin/hostname -s`" ]; then
-		return
 	else
 		# If we're not in a jail and rc.conf doesn't specify a
 		# hostname, see if we can get one from kenv.
@@ -77,5 +77,4 @@
 	check_startmsgs && echo '.'
 }
 
-load_rc_config $name
 run_rc_command "$1"