diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-01-11 18:57:03 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-01-11 18:57:03 +0000 |
| commit | 69b82e5ddae9dec0898097d0b2ff04f484701f2a (patch) | |
| tree | 3ef3466cb91776f354b09d70883b83d40a52a2dd /distrib/miniroot/install.sub | |
| parent | b8fd3c932ebf1cd18247b45dc470be34fda07948 (diff) | |
With wonderful new dhclient there is no need to try to kill a running
client or to run it with -1.
Diffstat (limited to 'distrib/miniroot/install.sub')
| -rw-r--r-- | distrib/miniroot/install.sub | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 86e105e701d..e1c1565fcbd 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.324 2003/12/21 21:45:41 krw Exp $ +# $OpenBSD: install.sub,v 1.325 2004/01/11 18:57:02 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2003 Todd Miller, Theo de Raadt, Ken Westerback @@ -545,8 +545,7 @@ __EOT lookup file bind __EOT - kill_dhclient - dhclient -1 $_ifs + dhclient $_ifs set -- $(inet_info $_ifs) @@ -702,7 +701,6 @@ enable_network() { [ "$mask" = "NONE" ] && mask= [ "$bcaddr" = "NONE" ] && bcaddr= ifconfig $if $name $mask $bcaddr $ext1 $ext2 down - kill_dhclient cmd="dhclient $if" ;; "up") @@ -1498,14 +1496,6 @@ __EOT done < /etc/fstab } -# Try to kill a running dhclient. -kill_dhclient() { - if [[ -f /var/run/dhclient.pid ]]; then - kill -HUP $(sed -ne "1p" /var/run/dhclient.pid) > /dev/null 2>&1 - rm -f /var/run/dhclient.pid - fi -} - # Preen all filesystems in /etc/fstab that have a /sbin/fsck_XXX, # showing individual results, but skipping $ROOTDEV. This was already # fsck'ed successfully. |