patch for /lib/rc/net/bridge.sh

openrc-POSIX.patch (text/plain), 808 bytes, created by Christian on 2011-01-29 11:57:10 UTC

--- /lib/rc/net/bridge.sh.old	2011-01-29 12:37:41.008538798 +0100
+++ /lib/rc/net/bridge.sh	2011-01-29 12:39:35.104675391 +0100
@@ -45,8 +45,8 @@ bridge_pre_start()
 	eval bridge_unset=\${bridge_${IFVAR}-y\}
 	eval brctl_unset=\${brctl_${IFVAR}-y\}
 	
-	if [ -z "${brif}" -a "${brctl_unset}" == 'y' ]; then
-		if [ -z "${ports}" -a "${bridge_unset}" == "y" ]; then
+	if [ -z "${brif}" ] && [ "${brctl_unset}" = 'y' ]; then
+		if [ -z "${ports}" ] && [ "${bridge_unset}" = "y" ]; then
 			#eerror "Misconfigured static bridge detected (see net.example)"
 			return 0
 		fi
@@ -57,7 +57,7 @@ bridge_pre_start()
 
 	(
 	# Normalize order of variables
-	if [ -z "${ports}" -a -n "${brif}" ]; then
+	if [ -z "${ports}" ] && [ -n "${brif}" ]; then
 		# Dynamic mode detected
 		ports="${IFACE}"
 		IFACE="${brif}"