diff -urN net-scripts-0.5.2/Changelog net-scripts-0.5.3/Changelog --- net-scripts-0.5.2/Changelog 2005-02-07 19:49:17 +0300 +++ net-scripts-0.5.3/Changelog 2005-02-08 16:26:58 +0300 @@ -1,3 +1,6 @@ +0.5.3 ++ BOOTPROTO=none and VLAN_NAMING=DEV_PLUS_VID_NO_PAD fix (#5891) + 0.5.2 + CIFS support (#5964) diff -urN net-scripts-0.5.2/sysconfig/network-scripts/ifup net-scripts-0.5.3/sysconfig/network-scripts/ifup --- net-scripts-0.5.2/sysconfig/network-scripts/ifup 2004-07-05 13:51:42 +0400 +++ net-scripts-0.5.3/sysconfig/network-scripts/ifup 2005-02-08 16:24:13 +0300 @@ -49,7 +49,7 @@ IPSETUP=no DEVICETYPE=`echo "$DEVICE" | sed "s/[0-9]*$//"` -REALDEVICE=`echo "$DEVICE" | sed 's/:.*//g'` +REALDEVICE=`echo "$DEVICE" | sed 's/[.:].*//g'` if echo "$DEVICE" | fgrep -qs ':'; then ISALIAS=yes else @@ -108,7 +108,7 @@ vlan_id=`echo $DEVICE | sed "s/^vlan0*//g"` ;; DEV_PLUS_VID|DEV_PLUS_VID_NO_PAD) - vlan_id=`echo $DEVICE | sed "s/^[a-z0-9]\+\.0*//g"` + vlan_id=`echo $DEVICE | sed "s/^[a-z0-9]*\.0*//g"` ;; esac @@ -319,7 +319,7 @@ exit 1 fi fi -else +elif [ "$BOOTPROTO" = static ]; then if [ -z "$NETMASK" ]; then eval `/bin/ipcalc --netmask "$IPADDR"` fi @@ -354,6 +354,9 @@ ip route add default dev "$DEVICE" fi fi +else +# BOOTPROTO unset or 'none' + ip link set dev "$DEVICE" up fi SYSCTL_PREFIX=net.ipv4.conf.$DEVICE