diff options
| author | Bill Nottingham <notting@redhat.com> | 2009-04-09 10:29:27 -0400 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2009-05-04 16:05:06 +0200 |
| commit | 9707e562c1c1e46d55a320aeefff0c64c667f1b1 (patch) | |
| tree | b2495ca29a75cbb60cecd78d304b933d2f4391d0 /sysconfig | |
| parent | d2a76a3ab0931fae034b3992a5068450971b7c22 (diff) | |
| download | initscripts-9707e562c1c1e46d55a320aeefff0c64c667f1b1.tar initscripts-9707e562c1c1e46d55a320aeefff0c64c667f1b1.tar.gz initscripts-9707e562c1c1e46d55a320aeefff0c64c667f1b1.tar.bz2 initscripts-9707e562c1c1e46d55a320aeefff0c64c667f1b1.tar.xz initscripts-9707e562c1c1e46d55a320aeefff0c64c667f1b1.zip | |
Allow changing of VLAN type even if the module is already loaded. (#495053, <pietro@bertera.it>)
Diffstat (limited to 'sysconfig')
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 7fa00a79..3f7aa394 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -77,17 +77,17 @@ if [ -x /sbin/vconfig -a "${VLAN}" = "yes" -a "$ISALIAS" = "no" ]; then fi if [ -n "$VID" ]; then if [ ! -d /proc/net/vlan ]; then - if modprobe 8021q >/dev/null 2>&1 ; then - 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." - } - else + if ! modprobe 8021q >/dev/null 2>&1 ; then echo $"No 802.1Q VLAN support available in kernel for device ${DEVICE}" exit 1 fi 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 echo $"$alias device ${DEVICE} does not seem to be present, delaying initialization." |