diff options
author | Bill Nottingham <notting@redhat.com> | 2012-06-08 11:02:54 -0400 |
---|---|---|
committer | Lukas Nykryn <lnykryn@redhat.com> | 2012-08-03 10:53:39 +0200 |
commit | efc3be4bb183ba5fed773197c4a48b5a39a28228 (patch) | |
tree | 5d7910583eb8c3dd4a186ca2e50b249a13325f54 | |
parent | 9987361e94ec6f26e557053b27af6e43a9ee13e1 (diff) | |
download | initscripts-efc3be4bb183ba5fed773197c4a48b5a39a28228.tar initscripts-efc3be4bb183ba5fed773197c4a48b5a39a28228.tar.gz initscripts-efc3be4bb183ba5fed773197c4a48b5a39a28228.tar.bz2 initscripts-efc3be4bb183ba5fed773197c4a48b5a39a28228.tar.xz initscripts-efc3be4bb183ba5fed773197c4a48b5a39a28228.zip |
Move VLAN= docs to the interface configuration section, rather than /etc/sysconfig/network.
Conflicts:
sysconfig.txt
-rw-r--r-- | sysconfig.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysconfig.txt b/sysconfig.txt index d682feff..01151a4e 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -185,7 +185,6 @@ Generic options: GATEWAY=<gateway IP> GATEWAYDEV=<gateway device to use, when multiple devices have GATEWAY=> (e.g. eth0) NISDOMAIN=<nis domain name> - VLAN=yes|no NOZEROCONF= Set this to not set a route for dynamic link-local addresses. @@ -530,6 +529,7 @@ Files in /etc/sysconfig/network-scripts/ HOTPLUG=yes|no USERCTL=yes|no BOOTPROTO=none|bootp|dhcp + VLAN=yes|no MTU= Default MTU for this device WINDOW= |