d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etc/rc.d/hostname: permit setting hostname if already set

Browse Source 
Approved by:	dteske
Differential Revision:	https://reviews.freebsd.org/D2577
This commit is contained in:
Mark Felder 2015-08-12 16:22:10 +00:00
parent 8c43e4ccfa
commit af588fdff7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=286671
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etc/rc.d/hostname
View File

@ -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.