diff options
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.d/hostname | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/etc/rc.d/hostname b/etc/rc.d/hostname index 13af220..3c239c4 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. |
