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 /rc.d/init.d | |
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 'rc.d/init.d')
-rwxr-xr-x | rc.d/init.d/network | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network index cc218541..c64c7021 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -37,9 +37,6 @@ fi # Even if IPX is configured, without the utilities we can't do much [ ! -x /sbin/ipx_internal_net ] || [ ! -x /sbin/ipx_configure ] && IPX= -# Even if VLAN is configured, without the utility we can't do much -[ ! -x /sbin/vconfig ] && VLAN= - CWD=$(pwd) cd /etc/sysconfig/network-scripts @@ -82,10 +79,7 @@ case "$1" in case "$VLAN" in yes) - if [ -d /proc/net/vlan ] || modprobe 8021q >/dev/null 2>&1 ; then - test -z "$VLAN_NAME_TYPE" && VLAN_NAME_TYPE=DEV_PLUS_VID_NO_PAD - action $"Setting 802.1Q VLAN parameters: " /sbin/vconfig set_name_type "$VLAN_NAME_TYPE" - else + if [ ! -d /proc/net/vlan ] && ! modprobe 8021q >/dev/null 2>&1 ; then echo $"No 802.1Q VLAN support available in kernel." fi ;; |