diff options
| author | Petr Lautrbach <plautrba@redhat.com> | 2010-05-12 14:00:11 +0200 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-05-13 12:40:07 -0400 |
| commit | a8b4a9d667c0b07eea7cecddd87dabe35cc2dc74 (patch) | |
| tree | 51fe225d5ef65fdbbfa10379ef92aad0b410ef97 /sysconfig | |
| parent | 5b4fa92a71a055172edeb0eacb3aa7462722eac4 (diff) | |
| download | initscripts-a8b4a9d667c0b07eea7cecddd87dabe35cc2dc74.tar initscripts-a8b4a9d667c0b07eea7cecddd87dabe35cc2dc74.tar.gz initscripts-a8b4a9d667c0b07eea7cecddd87dabe35cc2dc74.tar.bz2 initscripts-a8b4a9d667c0b07eea7cecddd87dabe35cc2dc74.tar.xz initscripts-a8b4a9d667c0b07eea7cecddd87dabe35cc2dc74.zip | |
use ip command for vlan instead of vconfig
Diffstat (limited to 'sysconfig')
| -rwxr-xr-x | sysconfig/network-scripts/ifdown-eth | 4 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 28 |
2 files changed, 8 insertions, 24 deletions
diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index 3399ee3c..19fc1f12 100755 --- a/sysconfig/network-scripts/ifdown-eth +++ b/sysconfig/network-scripts/ifdown-eth @@ -138,12 +138,12 @@ if [ "$retcode" = 0 ] ; then # the interface went down. fi -if [ -n "$VLAN" ] && [ -x /sbin/vconfig ]; then +if [ -n "$VLAN" ]; then # 802.1q VLAN if echo ${DEVICE} | LANG=C grep -Ev '(:)' | LANG=C grep -Eq '(eth|bond)[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?' \ || echo ${DEVICE} | LANG=C grep -Eq 'vlan[0-9][0-9]?[0-9]?[0-9]?' ; then [ -f /proc/net/vlan/${DEVICE} ] && { - /sbin/vconfig rem ${DEVICE} + ip link delete ${DEVICE} type vlan } fi fi diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index cc5efc97..c15d1d2a 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -71,7 +71,7 @@ if [ "$USE_NM" = "true" -a -n "$UUID" ]; then fi # Ethernet 802.1Q VLAN support -if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ] && [ -x /sbin/vconfig ]; then +if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ]; then VID="" MATCH='^(eth|hsi|bond)[0-9]+\.[0-9]{1,4}$' if [[ "${DEVICE}" =~ $MATCH ]]; then @@ -96,9 +96,6 @@ if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ] && [ -x /sbin/vconfig ]; then fi test -z "$VLAN_NAME_TYPE" && VLAN_NAME_TYPE=DEV_PLUS_VID_NO_PAD - /sbin/vconfig set_name_type "$VLAN_NAME_TYPE" >/dev/null 2>&1 || { - echo $"Could not set 802.1Q VLAN parameters." - } is_available ${PHYSDEV} || { if [ "$?" = "1" ] ; then @@ -115,30 +112,17 @@ if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ] && [ -x /sbin/vconfig ]; then } if [ ! -f /proc/net/vlan/${DEVICE} ]; then - /sbin/vconfig add ${PHYSDEV} ${VID} || { + if [ "${REORDER_HDR}" = "no" -o "${REORDER_HDR}" = "0" ]; then + FLAG_REORDER_HDR="reorder_hdr off" + fi + + ip link add dev ${DEVICE} link ${PHYSDEV} type vlan id ${VID} ${FLAG_REORDER_HDR} || { (/usr/bin/logger -p daemon.info -t ifup \ $"ERROR: could not add vlan ${VID} as ${DEVICE} on dev ${PHYSDEV}" &)& echo $"ERROR: could not add vlan ${VID} as ${DEVICE} on dev ${PHYSDEV}" exit 1 } fi - - if [ -f /proc/net/vlan/${DEVICE} ]; then - case "$REORDER_HDR" in - yes|1) - /sbin/vconfig set_flag ${DEVICE} 1 1 || { - (/usr/bin/logger -p daemon.info -t ifup \ - "WARNING: vconfig not able to enable REORDER_HDR on ${DEVICE}" &)& - } - ;; - no|0) - /sbin/vconfig set_flag ${DEVICE} 1 0 || { - (/usr/bin/logger -p daemon.info -t ifup \ - $"WARNING: vconfig not able to disable REORDER_HDR on ${DEVICE}" &)& - } - ;; - esac - fi fi fi |