release openrc-0.6.2

fix detection of renamed vlan interfaces
This fixes bug 327059, thanks to Jonathan for reporting this and for the patch.
2010-08-19 17:00:38 -05:00 · 2010-08-19 16:17:38 -05:00 · 2010-08-18 15:01:23 -05:00
3 changed files with 6 additions and 4 deletions
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.6.1
+VERSION=	0.6.2
 PKG=		${NAME}-${VERSION}
--- a/net/vlan.sh
+++ b/net/vlan.sh
@@ -20,7 +20,7 @@ _is_vlan()
 _get_vlans()
 {
 	[ -e /proc/net/vlan/config ] || return 1
-	sed -n -e 's/^\(.*[0-9]\) \(.* \) .*'"${IFACE}"'$/\1/p' /proc/net/vlan/config
+	sed -n -e 's/^\W*\([^ ]*\) \(.* \) .*'"${IFACE}"'$/\1/p' /proc/net/vlan/config
 }

 _check_vlan()
--- a/net/wpa_supplicant.sh
+++ b/net/wpa_supplicant.sh
@@ -183,9 +183,11 @@ wpa_supplicant_post_stop()
 	fi

 	if yesno "${IN_BACKGROUND}"; then
-		# Only stop wpa_supplicant if it's not the controlling daemon
-		! service_started_daemon "${RC_SVCNAME}" "${wpas}" 1
+		# Don't stop wpa_supplicant & wpa_cli if in background
+		return 0
 	fi
+	# Only stop wpa_supplicant if it's not the controlling daemon
+	! service_started_daemon "${RC_SVCNAME}" "${wpas}" 1
 	[ $? != 0 ] && return 0

 	local pidfile="/var/run/wpa_cli-${IFACE}.pid"
Author	SHA1	Message	Date
William Hubbs	ae3186834f	release openrc-0.6.2	2010-08-19 17:00:38 -05:00
William Hubbs	23546e27d9	fix detection of renamed vlan interfaces This fixes bug 327059, thanks to Jonathan for reporting this and for the patch.	2010-08-19 16:17:38 -05:00
William Hubbs	1a188f8f72	fix bug 266395 Do not stop wpa_supplicant or wpa_cli if they are in the background. Thanks to Slava Gorbunov for the patch.	2010-08-18 15:01:23 -05:00