File sysconfig_minor_output_cleanups.patch of Package sysconfig

File sysconfig_minor_output_cleanups.patch of Package sysconfig (Revision 1)

Currently displaying revision 1, show latest

--- scripts/ifup
+++ scripts/ifup	2008/02/01 07:59:41
@@ -1136,7 +1136,7 @@
 
 						# Make sure we have ipv6 support or skip this address
 						if [ "$ISv6" = "yes" ]; then
-							if ! sysctl net.ipv6 2>/dev/null; then
+							if ! sysctl net.ipv6 &>/dev/null; then
 								if ! modprobe net-pf-10 2>/dev/null; then
 									logerror "Missing IPv6 support." \
 									         "Ommitting address $IPADDR."
--- scripts/ifup-802.1q
+++ scripts/ifup-802.1q	2008/02/01 08:03:27
@@ -104,7 +104,9 @@
 		exit $R_INTERNAL
 	fi
 
-	/usr/sbin/vconfig add $ETHERDEVICE $id >/dev/null
+	if [ ! -d /sys/class/net/$INTERFACE ] ; then
+		/usr/sbin/vconfig add $ETHERDEVICE $id >/dev/null
+	fi
 	;;
 stop)
 	if [ -d /sys/class/net/$INTERFACE ] ; then
--- scripts/ifup-bridge
+++ scripts/ifup-bridge	2008/02/01 08:05:23
@@ -149,14 +149,14 @@
 	if [ $? -eq 0 ]; then
 		MESSAGE=`brctl delbr "$INTERFACE"`
 		if [ $? -ne 0 ]; then
-			logmessage "Error: failed to delete bridge $INTERFACE: $MESSAGE"
+			logerror "Error: failed to delete bridge $INTERFACE: $MESSAGE"
 			exit $R_STATUS
 		fi
 		for p in $BRIDGE_PORTS; do
 			PORT_INTERFACE=`getcfg-interface $p`
 			MESSAGE=`ip link set dev "$PORT_INTERFACE" down`
 			if [ $? -ne 0 ]; then
-				logmessage "Warning: failed to bring $p down: $MESSAGE"
+				info_mesg "Warning: failed to bring $p down: $MESSAGE"
 			fi
 		done
 	fi