diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-09-16 02:56:13 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-09-16 02:56:13 +0000 |
| commit | 0c6d0171e6369a3a59b5bd3582f1bfe4d6be83c1 (patch) | |
| tree | 17fc308a5521ed913411ed293ba601ab6e017fad /etc | |
| parent | 0f5297f5c3db8d88394b31f0dafb15d9098f851c (diff) | |
| download | src-0c6d0171e6369a3a59b5bd3582f1bfe4d6be83c1.tar.gz src-0c6d0171e6369a3a59b5bd3582f1bfe4d6be83c1.zip | |
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
Notes
Notes:
svn path=/head/; revision=120110
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.d/dhclient | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/etc/rc.d/dhclient b/etc/rc.d/dhclient index 895d34aece09..4df3bc21cf21 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" |