From: Enrico Scholz Date: Sat, 31 Dec 2005 10:39:24 +0000 (+0000) Subject: added 'novlandev' interface flag X-Git-Tag: version_0_30_210~52 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfa40e043f50b3ed0f89cdec01d0655c94c1e12e;p=util-vserver.git added 'novlandev' interface flag git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2229 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/doc/configuration.xml b/util-vserver/doc/configuration.xml index f0563ba..f085654 100644 --- a/util-vserver/doc/configuration.xml +++ b/util-vserver/doc/configuration.xml @@ -1073,6 +1073,13 @@ already. This can be used to assign primary interfaces which are created by the host or another vserver. + + +When this file exists, the steps which setup and destroy a VLAN +interface will be skipped. This flag should be set when a VLAN +interface is used by multiple vservers or by the host. + + diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index be47739..77e15ba 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -525,7 +525,7 @@ function _processSingleInterface echo -e $"VLAN device-name used, but vlan subsystem not enabled.\nTry to execute 'modprobe 8021q' before starting the vservers" >&2 return 1 } - test -f /proc/net/vlan || { + test -f /proc/net/vlan -o -e "$iface"/novlandev || { _addInterfaceCmd VCONFIG $vlan_info } fi