View | Details | Raw Unified | Return to bug 5891
Collapse All | Expand All

(-)net-scripts-0.5.2/Changelog (+3 lines)
Lines 1-3 Link Here
1
0.5.3
2
+ BOOTPROTO=none and VLAN_NAMING=DEV_PLUS_VID_NO_PAD fix (#5891)
3
1
0.5.2
4
0.5.2
2
+ CIFS support (#5964)
5
+ CIFS support (#5964)
3
6
(-)net-scripts-0.5.2/sysconfig/network-scripts/ifup (-3 / +6 lines)
Lines 49-55 Link Here
49
IPSETUP=no
49
IPSETUP=no
50
50
51
DEVICETYPE=`echo "$DEVICE" | sed "s/[0-9]*$//"`
51
DEVICETYPE=`echo "$DEVICE" | sed "s/[0-9]*$//"`
52
REALDEVICE=`echo "$DEVICE" | sed 's/:.*//g'`
52
REALDEVICE=`echo "$DEVICE" | sed 's/[.:].*//g'`
53
if echo "$DEVICE" | fgrep -qs ':'; then
53
if echo "$DEVICE" | fgrep -qs ':'; then
54
    ISALIAS=yes
54
    ISALIAS=yes
55
else
55
else
Lines 108-114 Link Here
108
	    vlan_id=`echo $DEVICE | sed "s/^vlan0*//g"`
108
	    vlan_id=`echo $DEVICE | sed "s/^vlan0*//g"`
109
	    ;;
109
	    ;;
110
	DEV_PLUS_VID|DEV_PLUS_VID_NO_PAD)
110
	DEV_PLUS_VID|DEV_PLUS_VID_NO_PAD)
111
	    vlan_id=`echo $DEVICE | sed "s/^[a-z0-9]\+\.0*//g"`
111
	    vlan_id=`echo $DEVICE | sed "s/^[a-z0-9]*\.0*//g"`
112
	    ;;
112
	    ;;
113
    esac
113
    esac
114
114
Lines 319-325 Link Here
319
			exit 1
319
			exit 1
320
		fi
320
		fi
321
	fi
321
	fi
322
else
322
elif [ "$BOOTPROTO" = static ]; then
323
	if [ -z "$NETMASK" ]; then
323
	if [ -z "$NETMASK" ]; then
324
		eval `/bin/ipcalc --netmask "$IPADDR"`
324
		eval `/bin/ipcalc --netmask "$IPADDR"`
325
	fi
325
	fi
Lines 354-359 Link Here
354
			ip route add default dev "$DEVICE"
354
			ip route add default dev "$DEVICE"
355
		fi
355
		fi
356
	fi
356
	fi
357
else
358
# BOOTPROTO unset or 'none'
359
	ip link set dev "$DEVICE" up
357
fi
360
fi
358
361
359
SYSCTL_PREFIX=net.ipv4.conf.$DEVICE
362
SYSCTL_PREFIX=net.ipv4.conf.$DEVICE

Return to bug 5891