diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 13:38:40 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 13:38:40 +0100 |
| commit | 83e587cc2ca21ff7e0eaa5e53d8d3edaca7a1d6d (patch) | |
| tree | 94c7b37e550af153c3d86bc854c67d2b44458836 /package/base-files | |
| parent | 0ed8c5474b6d5033fef536500cfc4d64c6debc66 (diff) | |
| parent | 67ec049f25e299957fada55ea8738e0967547c6f (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/base-files')
| -rwxr-xr-x | package/base-files/src/etc/network/if-pre-up.d/02-vlan | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/package/base-files/src/etc/network/if-pre-up.d/02-vlan b/package/base-files/src/etc/network/if-pre-up.d/02-vlan index 35b7fca59..26b33ca80 100755 --- a/package/base-files/src/etc/network/if-pre-up.d/02-vlan +++ b/package/base-files/src/etc/network/if-pre-up.d/02-vlan @@ -1,12 +1,18 @@ #!/bin/sh -[ -x /sbin/vconfig ] || exit 0 -[ -d /proc/net/vlan ] || exit 0 +which vconfig || { + echo "vconfig executable not found, aborting" + exit 0 +} +[ -d /proc/net/vlan ] || { + echo "no kernel support for 802.1q found, aborting" + exit 0 +} case "$IFACE" in vlan*) - vconfig set_name_type VLAN_PLUS_VID_NO_PAD - VLANID=`echo $IFACE|sed "s/vlan*//"` + vconfig set_name_type VLAN_PLUS_VID_NO_PAD + VLANID=`echo $IFACE|sed "s/vlan*//"` ;; eth*.*) vconfig set_name_type DEV_PLUS_VID_NO_PAD |