Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory vz-cvs-3.sog:/tmp/cvs-serv16123
Modified Files:
network
Log Message:
use "ip" instead of "vconfig". The next step is to remove 'vconfig' completely
Index: network
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/network,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- network 5 Feb 2012 14:30:29 -0000 1.58
+++ network 14 Mar 2012 07:07:40 -0000 1.59
@@ -183,10 +183,10 @@
# vlan-id needs to be a number. id's 0 and 4095 are reserved
if test -n "$VLANID" -a "$VLANID" -gt 0 -a "$VLANID" -lt 4095 2>/dev/null; then
echo -n "Setting vlan #$VLANID on physical interface $DEVICE"
- $VLAN add $DEVICE $VLANID > /dev/null
- evaluate_retval
PHYDEV=$DEVICE
DEVICE=$(get_vlan_name "$PHYDEV" "$VLANID")
+ ip link add link $PHYDEV name $DEVICE type vlan id $VLANID
+ evaluate_retval
fi
# bridge
@@ -460,7 +460,7 @@
# vlan-id's 0 and 4095 are reserved
if test -n "$VLANID" -a "$VLANID" -gt 0 -a "$VLANID" -lt 4095 2>/dev/null; then
echo -n "Removing vlan #$VLANID from physical interface $PHYDEV"
- $VLAN rem $DEVICE > /dev/null
+ ip link del $DEVICE type vlan id $VLANID
evaluate_retval
fi
|
