svn commit: r343675 - stable/12/libexec/rc

[Andriy Voskoboinyk]

Author: avos
Date: Sat Feb  2 04:19:35 2019
New Revision: 343675
URL: https://svnweb.freebsd.org/changeset/base/343675

Log:
  MFC r343499:
  rc(8): do not stop dhclient(8) when wpa_supplicant(8) / hostapd(8) is used
  
  They will stop it automatically ('Interface wlan0 is down,
  dhclient exiting'); use /etc/rc.d/dhclient stop command only when
  none of them is used.

Modified:
  stable/12/libexec/rc/network.subr
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/rc/network.subr
==============================================================================
--- stable/12/libexec/rc/network.subr	Sat Feb  2 04:15:16 2019	(r343674)
+++ stable/12/libexec/rc/network.subr	Sat Feb  2 04:19:35 2019	(r343675)
@@ -257,9 +257,7 @@ ifconfig_down()
 	elif hostapif $1; then
 		/etc/rc.d/hostapd stop $1
 		_cfg=0
-	fi
-
-	if dhcpif $1; then
+	elif dhcpif $1; then
 		/etc/rc.d/dhclient stop $1
 		_cfg=0
 	fi