From 961245240d0d3603c9e577506b78d7fdbdb896d6 Mon Sep 17 00:00:00 2001 From: mbr Date: Tue, 16 Sep 2003 02:56:13 +0000 Subject: Get rid of a nasty error message that tells us dhclient couldn't get killed. If we execute 'dhclient -r', dhclient gets already killed, so there is no need to do it twice. Only do this if we really have to release some leases. Reviewed by: silence on freebsd-rc@yahoogroups.com --- etc/rc.d/dhclient | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/etc/rc.d/dhclient b/etc/rc.d/dhclient index 895d34a..4df3bc2 100755 --- a/etc/rc.d/dhclient +++ b/etc/rc.d/dhclient @@ -53,8 +53,9 @@ dhclient_common() dhclient_prestart() { - dhclient_common || return 1 - + if [ $dhclient_common_error -eq 1 ]; then + return 1 + fi for ifn in ${_cooked_list}; do ifscript_up ${ifn} done @@ -78,8 +79,9 @@ dhclient_poststart() dhclient_prestop() { - dhclient_common || return 1 - + if [ $dhclient_common_error -eq 1 ]; then + return 1 + fi for ifn in ${_cooked_list}; do ipx_down ${ifn} ifalias_down ${ifn} @@ -110,4 +112,11 @@ if [ -n "$2" ]; then fi load_rc_config $name +dhclient_common_error=0 +dhclient_common || dhclient_common_error=1; +if [ -n "$_cooked_list" ]; then + if [ -s $pidfile ]; then + stop_cmd=":" + fi +fi run_rc_command "$1" -- cgit v1.1