aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-03-30 12:50:03 -0400
committerBill Nottingham <notting@redhat.com>2011-03-30 12:50:03 -0400
commite922bebb5a023b7a627fa14d5a4d58e6a0cca527 (patch)
tree511ac4b6e66e0d62eb8a9a501fc01b49103c84d7
parentae1353b8528561a41fe82314f3ee010a82e6da7a (diff)
downloadinitscripts-e922bebb5a023b7a627fa14d5a4d58e6a0cca527.tar
initscripts-e922bebb5a023b7a627fa14d5a4d58e6a0cca527.tar.gz
initscripts-e922bebb5a023b7a627fa14d5a4d58e6a0cca527.tar.bz2
initscripts-e922bebb5a023b7a627fa14d5a4d58e6a0cca527.tar.xz
initscripts-e922bebb5a023b7a627fa14d5a4d58e6a0cca527.zip
Document NM_CONTROLLED. (#692123)
-rw-r--r--sysconfig.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/sysconfig.txt b/sysconfig.txt
index 21835e90..58a37e1a 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -593,6 +593,9 @@ Files in /etc/sysconfig/network-scripts/
the default route.
DHCLIENTARGS=
Any additional arguments to dhclient.
+ NM_CONTROLLED=yes|no
+ If set to 'no', NetworkManager will ignore this connection/device.
+ Defaults to 'yes'.
If BOOTPROTO is not "none", then the only other item that
must be set is the DEVICE item; all the rest will be determined