From: krw Date: Wed, 29 Aug 2018 11:30:48 +0000 (+0000) Subject: Historically /etc/netstart (and the equivalent code in the install X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8c1551d3e05d1fd4f492f08eca4a043ed78dfa72;p=openbsd Historically /etc/netstart (and the equivalent code in the install script) did 'ifconfig down' before starting dhclient(8). This was a way of ensuring old running copies of dhclient were killed before a new one started. Current dhclient does not need this assist, so change "ifconfig down" to "ifconfig up" pending further script optimizations. Similar to a 2014 attempt by halex@. Prompted by a misc@ report from Kristjan Komlosi reporting hanging diskless setups. ok halex@ kn@ --- diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 135dbe70868..1585d6c15d7 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1101 2018/08/22 16:53:36 tb Exp $ +# $OpenBSD: install.sub,v 1.1102 2018/08/29 11:30:48 krw Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer @@ -2311,7 +2311,7 @@ parse_hn_line() { ;; dhcp) ! $_has_dhclient && return _c[0]= - _cmds[${#_cmds[*]}]="ifconfig $_if ${_c[@]} down;dhclient $_if" + _cmds[${#_cmds[*]}]="ifconfig $_if ${_c[@]} up;dhclient $_if" V4_DHCPCONF=true ;; '!'*|bridge) diff --git a/etc/netstart b/etc/netstart index 4010a25f81f..55da9c01a36 100644 --- a/etc/netstart +++ b/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: netstart,v 1.199 2018/07/08 20:10:26 tb Exp $ +# $OpenBSD: netstart,v 1.200 2018/08/29 11:30:48 krw Exp $ # Turn off Strict Bourne shell mode. set +o sh @@ -65,7 +65,7 @@ parse_hn_line() { _cmds[$_prev]="${_c[@]}" ;; dhcp) _c[0]= - _cmds[${#_cmds[*]}]="ifconfig $_if ${_c[@]} down;dhclient $_if" + _cmds[${#_cmds[*]}]="ifconfig $_if ${_c[@]} up;dhclient $_if" V4_DHCPCONF=true ;; '!'*) _cmd=$(print -- "${_c[@]}" | sed 's/\$if/'$_if'/g')