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:48:47 -0400 |
| commit | 286e6430ce2b1873e319e5edfa08c45806fbedab (patch) | |
| tree | d763ee1d96f2e43a350bae67c43ca78915c1112d /rc.d | |
| parent | eaeb72231350ed442979a7616cf547859a885609 (diff) | |
| download | initscripts-286e6430ce2b1873e319e5edfa08c45806fbedab.tar initscripts-286e6430ce2b1873e319e5edfa08c45806fbedab.tar.gz initscripts-286e6430ce2b1873e319e5edfa08c45806fbedab.tar.bz2 initscripts-286e6430ce2b1873e319e5edfa08c45806fbedab.tar.xz initscripts-286e6430ce2b1873e319e5edfa08c45806fbedab.zip | |
use ip command for vlan instead of vconfig
Diffstat (limited to 'rc.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 9e0fc2a0..232f3e2c 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -34,9 +34,6 @@ fi # if the ip configuration utility isn't around we can't function. [ -x /sbin/ip ] || exit 1 -# Even if VLAN is configured, without the utility we can't do much -[ ! -x /sbin/vconfig ] && VLAN= - CWD=$(pwd) cd /etc/sysconfig/network-scripts @@ -69,10 +66,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 ;; |