diff options
| author |   halex <halex@openbsd.org> | 2013-03-25 21:35:45 +0000 |
|---|---|---|
| committer | halex <halex@openbsd.org> | 2013-03-25 21:35:45 +0000 |
| commit | a3b2459b5c400231918f31830983dda9c53023a9 (patch) | |
| tree | fae972491a8a6410ea7d6ffd928d508bcfdc9741 | |
| parent | first cut at sets for perl 5.16.3 (diff) | |
| download | wireguard-openbsd-a3b2459b5c400231918f31830983dda9c53023a9.tar.xz wireguard-openbsd-a3b2459b5c400231918f31830983dda9c53023a9.zip | |
during upgrade network setup, print friendlier error message if
/sbin/dhclient is required but missing
brought to attention by florian@
ok krw@
| -rw-r--r-- | distrib/miniroot/install.sub | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 5b9fb28af52..7aa63a0a807 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.674 2013/01/02 20:35:00 krw Exp $ +# $OpenBSD: install.sub,v 1.675 2013/03/25 21:35:45 halex Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -1006,7 +1006,11 @@ enable_network() { [ "$bcaddr" = "NONE" ] && bcaddr= dhcpif="$dhcpif $if" cmd="ifconfig $if $name $mask $bcaddr $ext1 $ext2 down" - cmd="$cmd; dhclient $if" + if [[ -x /sbin/dhclient ]]; then + cmd="$cmd; dhclient $if" + else + cmd="$cmd; echo /sbin/dhclient missing - skipping dhcp request." + fi # Create a new bpf in case we start another dhclient makedev bpf$(ls /dev | grep -c "^bpf[0-9]") ;; |