diff options
author | Bill Nottingham <notting@redhat.com> | 2004-06-07 19:16:04 +0000 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2004-06-07 19:16:04 +0000 |
commit | df05d00c3e64dec541cd615d67565a71da0c4a0f (patch) | |
tree | 163f0662cd5102b2defd42837f532fbe98824981 /sysconfig | |
parent | 19e0b412145b58e4dd1b403acc062f669b220b16 (diff) | |
download | initscripts-df05d00c3e64dec541cd615d67565a71da0c4a0f.tar initscripts-df05d00c3e64dec541cd615d67565a71da0c4a0f.tar.gz initscripts-df05d00c3e64dec541cd615d67565a71da0c4a0f.tar.bz2 initscripts-df05d00c3e64dec541cd615d67565a71da0c4a0f.tar.xz initscripts-df05d00c3e64dec541cd615d67565a71da0c4a0f.zip |
vlan fixes (#107504, <hrunting@texas.net>)
Diffstat (limited to 'sysconfig')
-rwxr-xr-x | sysconfig/network-scripts/ifdown | 2 | ||||
-rwxr-xr-x | sysconfig/network-scripts/ifup | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index 7aa852ca..a7527e30 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -124,7 +124,7 @@ fi if [ -n "$VLAN" -a -x /sbin/vconfig ]; then # 802.1q VLAN - if echo ${DEVICE} | LANG=C egrep -v '(:)' | LANG=C egrep -q 'eth[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?' ; then + if echo ${DEVICE} | LANG=C egrep -v '(:)' | LANG=C egrep -q '(eth|bond)[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?' ; then [ -f /proc/net/vlan/${DEVICE} ] && { /sbin/vconfig rem ${DEVICE} } diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 39079fd0..7fb3881c 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -55,7 +55,7 @@ fi # Ethernet 802.1Q VLAN support if [ -x /sbin/vconfig -a "${VLAN}" = "yes" ]; then - if echo ${DEVICE} | LANG=C egrep -v '(:)' | LANG=C egrep -q 'eth[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?' ; then + if echo ${DEVICE} | LANG=C egrep -v '(:)' | LANG=C egrep -q '(eth|bond)[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?' ; then if [ ! -d /proc/net/vlan ]; then if modprobe 8021q >/dev/null 2>&1 ; then /sbin/vconfig set_name_type DEV_PLUS_VID_NO_PAD >/dev/null 2>&1 || { @@ -67,10 +67,10 @@ if [ -x /sbin/vconfig -a "${VLAN}" = "yes" ]; then fi fi VID="`echo ${DEVICE} | \ - LANG=C egrep 'eth[0-9]+\.[0-9][0-9]?[0-9]?[0-9]?$' | \ + LANG=C egrep '(eth|bond)[0-9]+\.[0-9][0-9]?[0-9]?[0-9]?$' | \ LANG=C sed 's/^[a-z0-9]*\.//g;s/^0*//'`" PHYSDEV="`echo ${DEVICE} | \ - LANG=C egrep 'eth[0-9]+\.[0-9][0-9]?[0-9]?[0-9]?$' | \ + LANG=C egrep '(eth|bond)[0-9]+\.[0-9][0-9]?[0-9]?[0-9]?$' | \ LANG=C sed 's/\.[a-z0-9]*$//g'`" is_available ${PHYSDEV} || { |