70d4ef1ea1
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. In the following scripts substitute if/then/fi for the simpler (and more consistent) check_startmsgs &&: faith stf 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
158 lines
3.7 KiB
Bash
Executable File
158 lines
3.7 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 ``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 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: netif
|
|
# REQUIRE: atm1 cleanvar FILESYSTEMS serial sppp sysctl
|
|
# REQUIRE: ipfilter ipfs
|
|
# KEYWORD: nojail
|
|
|
|
. /etc/rc.subr
|
|
. /etc/network.subr
|
|
|
|
name="network"
|
|
start_cmd="network_start"
|
|
stop_cmd="network_stop"
|
|
cloneup_cmd="clone_up"
|
|
clonedown_cmd="clone_down"
|
|
extra_commands="cloneup clonedown"
|
|
cmdifn=
|
|
|
|
set_rcvar_obsolete ipv6_enable ipv6_prefer
|
|
|
|
network_start()
|
|
{
|
|
# Set the list of interfaces to work on.
|
|
#
|
|
cmdifn=$*
|
|
|
|
if [ -z "$cmdifn" ]; then
|
|
#
|
|
# We're operating as a general network start routine.
|
|
#
|
|
|
|
# disable SIGINT (Ctrl-c) when running at startup
|
|
trap : 2
|
|
|
|
# Create cloned interfaces
|
|
clone_up
|
|
|
|
# Create Fast EtherChannel interfaces
|
|
fec_up
|
|
|
|
# Create IPv6<-->IPv4 tunnels
|
|
gif_up
|
|
|
|
# Rename interfaces.
|
|
ifnet_rename
|
|
fi
|
|
|
|
# Configure the interface(s).
|
|
network_common ifn_start
|
|
|
|
if [ -f /etc/rc.d/ipfilter ] ; then
|
|
# Resync ipfilter
|
|
/etc/rc.d/ipfilter quietresync
|
|
fi
|
|
if [ -f /etc/rc.d/bridge -a -n "$cmdifn" ] ; then
|
|
/etc/rc.d/bridge start $cmdifn
|
|
fi
|
|
}
|
|
|
|
network_stop()
|
|
{
|
|
# Set the list of interfaces to work on.
|
|
#
|
|
cmdifn=$*
|
|
|
|
# Deconfigure the interface(s)
|
|
network_common ifn_stop
|
|
}
|
|
|
|
# network_common routine
|
|
# Common configuration subroutine for network interfaces. This
|
|
# routine takes all the preparatory steps needed for configuriing
|
|
# an interface and then calls $routine.
|
|
network_common()
|
|
{
|
|
local _cooked_list _fail _func _ok _str
|
|
|
|
_func=
|
|
|
|
if [ -z "$1" ]; then
|
|
err 1 "network_common(): No function name specified."
|
|
else
|
|
_func="$1"
|
|
fi
|
|
|
|
# Set the scope of the command (all interfaces or just one).
|
|
#
|
|
_cooked_list=
|
|
if [ -n "$cmdifn" ]; then
|
|
# Don't check that the interface(s) exist. We need to run
|
|
# the down code even when the interface doesn't exist to
|
|
# kill off wpa_supplicant.
|
|
# XXXBED: is this really true or does wpa_supplicant die?
|
|
# if so, we should get rid of the devd entry
|
|
_cooked_list="$cmdifn"
|
|
else
|
|
_cooked_list="`list_net_interfaces`"
|
|
fi
|
|
|
|
_fail=
|
|
_ok=
|
|
for ifn in ${_cooked_list}; do
|
|
if ${_func} ${ifn} $2; then
|
|
_ok="${_ok} ${ifn}"
|
|
else
|
|
_fail="${_fail} ${ifn}"
|
|
fi
|
|
done
|
|
|
|
_str=
|
|
if [ -n "${_ok}" ]; then
|
|
case ${_func} in
|
|
ifn_start)
|
|
_str='Starting'
|
|
;;
|
|
ifn_stop)
|
|
_str='Stopping'
|
|
;;
|
|
esac
|
|
echo "${_str} Network:${_ok}."
|
|
if check_startmsgs; then
|
|
for ifn in ${_ok}; do
|
|
/sbin/ifconfig ${ifn}
|
|
done
|
|
fi
|
|
fi
|
|
|
|
debug "The following interfaces were not configured: $_fail"
|
|
}
|
|
|
|
load_rc_config $name
|
|
run_rc_command $*
|