Fix handling of rc_force in /etc/rc.d/dhclient
Variable 'rc_force' is accessible only at the time of rc_run_command, so it can't be examined from the script's main code. Spotted by: hrs Reviewed by: hrs, des Approved by: des MFC after: 2 weeks
This commit is contained in:
parent
f78094a515
commit
0c4b17e1e7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=226879
@ -15,9 +15,21 @@ name="dhclient"
|
||||
rcvar=
|
||||
pidfile="/var/run/${name}.${ifn}.pid"
|
||||
start_precmd="dhclient_prestart"
|
||||
stop_precmd="dhclient_pre_check"
|
||||
|
||||
# rc_force check can only be done at the run_rc_command
|
||||
# time, so we're testing it in the pre* hooks.
|
||||
dhclient_pre_check()
|
||||
{
|
||||
if [ -z "${rc_force}" ] && ! dhcpif $ifn; then
|
||||
err 1 "'$ifn' is not a DHCP-enabled interface"
|
||||
fi
|
||||
}
|
||||
|
||||
dhclient_prestart()
|
||||
{
|
||||
dhclient_pre_check
|
||||
|
||||
# Interface-specific flags (see rc.subr for $flags setting)
|
||||
specific=$(get_if_var $ifn dhclient_flags_IF)
|
||||
if [ -z "$flags" -a -n "$specific" ]; then
|
||||
@ -38,11 +50,8 @@ load_rc_config network
|
||||
if [ -z $ifn ] ; then
|
||||
# only complain if a command was specified but no interface
|
||||
if [ -n "$1" ] ; then
|
||||
echo 1>&2 "$0: no interface specified"
|
||||
return 1
|
||||
err 1 "$0: no interface specified"
|
||||
fi
|
||||
elif [ -z "${rc_force}" ] && ! dhcpif $ifn; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
run_rc_command "$1"
|
||||
|
Loading…
Reference in New Issue
Block a user