From af588fdff737b28379a2af0f3d792e033d230e5e Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 12 Aug 2015 16:22:10 +0000
Subject: [PATCH] etc/rc.d/hostname: permit setting hostname if already set

Approved by:	dteske
Differential Revision:	https://reviews.freebsd.org/D2577
---
 etc/rc.d/hostname | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/etc/rc.d/hostname b/etc/rc.d/hostname
index 13af220e6d2..3c239c46bfa 100755
--- a/etc/rc.d/hostname
+++ b/etc/rc.d/hostname
@@ -39,16 +39,13 @@ 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.