Attachment 914716 Details for Bug 1116394 – ifup 6.5 vs 6.6 diff

[patch] ifup 6.5 vs 6.6 diff

ifup.diff (text/plain), 1.55 KB, created by Robin Hack on 2014-07-04 12:55:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robin Hack

Created: 2014-07-04 12:55:50 UTC

Size: 1.55 KB

patch

obsolete

>--- ./ifup-01	2014-07-04 14:29:32.628418100 +0200
>+++ ./ifup-03	2014-07-04 14:29:57.372568753 +0200
>@@ -71,28 +71,21 @@
> fi
> 
> # Ethernet 802.1Q VLAN support
>-if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ] && [ -n $DEVICE ]; then
>-    if [ -n ${VID} ]; then
>-        if test -z "$PHYSDEV"; then
>-            net_log $"PHYSDEV should be set for device ${DEVICE}"
>-            exit 1
>-        fi
>-    else
>-        VID=""
>-        MATCH='^.+\.[0-9]{1,4}$'
>-        if [[ "${DEVICE}" =~ $MATCH ]]; then
>-            VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^.*\.$[0-9]\+$/\1/')
>-            PHYSDEV=${DEVICE%.*}
>-        fi
>-        MATCH='^vlan[0-9]{1,4}?'
>-         if [[ "${DEVICE}" =~ $MATCH ]]; then
>-             VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^vlan0*//'):
>-             # PHYSDEV should be set in ifcfg-vlan* file
>-             if test -z "$PHYSDEV"; then
>-                net_log $"PHYSDEV should be set for device ${DEVICE}"
>-                exit 1
>-             fi
>-        fi
>+if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ]; then
>+    VID=""
>+    MATCH='^.+\.[0-9]{1,4}$'
>+    if [[ "${DEVICE}" =~ $MATCH ]]; then
>+	VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^.*\.$[0-9]\+$/\1/')
>+	PHYSDEV=${DEVICE%.*}
>+    fi
>+    MATCH='^vlan[0-9]{1,4}?'
>+    if [[ "${DEVICE}" =~ $MATCH ]]; then
>+	VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^vlan0*//')
>+	# PHYSDEV should be set in ifcfg-vlan* file
>+	if test -z "$PHYSDEV"; then
>+		net_log $"PHYSDEV should be set for device ${DEVICE}"
>+		exit 1
>+	fi
>     fi
>     if [ -n "$VID" ]; then
> 	if [ ! -d /proc/net/vlan ]; then

Actions: View | Diff

Attachments on bug 1116394: 914716