888d94cf9b
In regards to the "Starting foo:" type messages at boot time, create and employ a more generic solution, and use it in the individual rc.d scripts that also have an $rc_quiet test: 1. Add check_startmsgs() to rc.subr. 2. In the rc.d scripts that use rc_quiet (and rc.subr) substitute variations of [ -z "$rc_quiet" ] with check_startmsgs 3. In savecore add a trailing '.' to the end of the message to make it more consistent with other scripts. 4. In newsyslog remove a : before the terminal '.' since we do not expect there to be anything printed out in between to make it more consistent. 5. In the following scripts change "quotes" to 'quotes' where no variables exist in the message: savecore pf newsyslog 6. [Does not apply in RELENG_8] 7. In the following scripts separate the "Starting foo:" from the terminal '.' to make them more consistent: moused hostname pf 8. In nfsclient move the message to its own line to avoid a style bug 9. In pf rc_quiet does not apply to the _stop method, so remove the test there. 10. In motd add 'quotes' around the terminal '.' for consistency Approved by: re (kib)
82 lines
2.6 KiB
Bash
Executable File
82 lines
2.6 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2003 The FreeBSD Project. All rights reserved.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions
|
|
# are met:
|
|
# 1. Redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer.
|
|
# 2. Redistributions in binary form must reproduce the above copyright
|
|
# notice, this list of conditions and the following disclaimer in the
|
|
# documentation and/or other materials provided with the distribution.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
|
|
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
# ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
|
|
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
# SUCH DAMAGE.
|
|
#
|
|
# $FreeBSD$
|
|
#
|
|
|
|
# PROVIDE: hostname
|
|
# REQUIRE: FILESYSTEMS
|
|
# BEFORE: netif
|
|
|
|
. /etc/rc.subr
|
|
. /etc/network.subr
|
|
|
|
name="hostname"
|
|
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 [ `$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.
|
|
#
|
|
if [ -z "${hostname}" -a \
|
|
-n "`/bin/kenv dhcp.host-name 2> /dev/null`" ]; then
|
|
hostname=`/bin/kenv dhcp.host-name`
|
|
fi
|
|
fi
|
|
|
|
# Have we got a hostname yet?
|
|
#
|
|
if [ -z "${hostname}" ]; then
|
|
# Null hostname is probably OK if DHCP is in use.
|
|
#
|
|
if [ -z "`list_net_interfaces dhcp`" ]; then
|
|
warn "\$hostname is not set -- see ${rcvar_manpage}."
|
|
fi
|
|
return
|
|
fi
|
|
|
|
# All right, it is safe to invoke hostname(1) now.
|
|
#
|
|
check_startmsgs && echo -n "Setting hostname: ${hostname}"
|
|
/bin/hostname "${hostname}"
|
|
check_startmsgs && echo '.'
|
|
}
|
|
|
|
load_rc_config $name
|
|
run_rc_command "$1"
|