diff options
| author |   krw <krw@openbsd.org> | 2020-02-02 20:33:52 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-02-02 20:33:52 +0000 |
| commit | 79e9e8a11815a871b683e74779cd9408806941a2 (patch) | |
| tree | ec1d7e9cf75d52d4f89200a30308db5a5d739933 /distrib/miniroot | |
| parent | Add missing new line to printf. Make clean should not require SUDO. (diff) | |
| download | wireguard-openbsd-79e9e8a11815a871b683e74779cd9408806941a2.tar.xz wireguard-openbsd-79e9e8a11815a871b683e74779cd9408806941a2.zip | |
Tweak dhclient(8) timing defaults depending on SMALL rather than using
/dev/stdin to fake a dhclient.conf file during install. Simplifies and
shortens install.sub code. Allows further restrictions to be applied
to '-c' specified files.
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sub | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 65ca20c753b..028a9ee9a1d 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1146 2020/01/26 10:47:07 krw Exp $ +# $OpenBSD: install.sub,v 1.1147 2020/02/02 20:33:52 krw Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -892,11 +892,7 @@ dhcp_request() { ifconfig $_if group dhcp >/dev/null 2>&1 if [[ -x /sbin/dhclient ]]; then - /sbin/dhclient -c /dev/stdin $_if <<__EOT -backoff-cutoff 2; -reboot 5; -timeout 10; -__EOT + /sbin/dhclient $_if else echo "DHCP leases not available during install - no /sbin/dhclient." fi |