summary refs log tree commit diff
path: root/man/NetworkManager.conf.5
diff options
context:
space:
mode:
Diffstat (limited to 'man/NetworkManager.conf.5')
-rw-r--r--man/NetworkManager.conf.547
1 files changed, 40 insertions, 7 deletions
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index c3af6116..ba575c94 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,7 +2,7 @@
 .\"
 .\" Copyright (C) 2010 Red Hat, Inc.
 .\"
-.TH "NetworkManager.conf" "5" "1 February 2010" ""
+.TH "NetworkManager.conf" "5" "16 September 2010" ""
 .SH NAME
 NetworkManager.conf \- NetworkManager configuration file
 .SH SYNOPSIS
@@ -44,12 +44,13 @@ Description of sections and available keys follows:
 This section is the only mandatory section of the configuration file.
 .TP
 .B plugins=\fIplugin1\fP,\fIplugin2\fP, ...
-List plugin names separated by ','. Plugins are used to read/write system-wide
-connection. When more plugins are specified, the connections are read from all
-listed plugins. When writing connections, the plugins will be asked to save the
-connection in the order listed here. If the first plugin cannot write out that
-connection type, or can't write out any connections, the next plugin is tried.
-If none of the plugins can save the connection, the error is returned to the user.
+List system settings plugin names separated by ','. These plugins are used to
+read/write system-wide connection. When more plugins are specified, the
+connections are read from all listed plugins. When writing connections, the
+plugins will be asked to save the connection in the order listed here. If the
+first plugin cannot write out that connection type, or can't write out any
+connections, the next plugin is tried. If none of the plugins can save the
+connection, the error is returned to the user.
 .P
 .RS
 .B "Available plugins:"
@@ -87,6 +88,38 @@ This key sets up what DHCP client NetworkManager will use. Presently
 \fIdhclient\fP and \fIdhcpcd\fP are supported. The client configured here should
 be available on your system too. If this key is missing, available DHCP clients
 are looked for in this order: dhclient, dhcpcd.
+.TP
+.B no-auto-default=\fI<hwaddr>\fP,\fI<hwaddr>\fP,... | \fI*\fP
+Set devices for which NetworkManager shouldn't create default wired connection
+(Auto eth0). NetworkManager creates a default wired connection for any wired
+device that is managed and doesn't have a connection configured. List a device
+in this option to inhibit creating the default connection for the device.
+.br
+When the default wired connection is deleted or saved to a new persistent connection
+by a plugin, the MAC address of the wired device is automatically added to this list
+to prevent creating the default connection for that device again.
+Devices are specified by their MAC addresses, in lowercase. Multiple
+entries are separated by commas. You can use the glob character \fI*\fP instead
+of listing addresses to specify all devices.
+.br
+Examples:
+.nf
+no-auto-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee
+no-auto-default=*
+.fi
+.TP
+.B dns=\fIplugin1\fP,\fIplugin2\fP, ...
+List DNS plugin names separated by ','. DNS plugins are used to provide local
+caching nameserver functionality (which speeds up DNS queries) and to push
+DNS data to applications that use it.
+.P
+.RS
+.B "Available plugins:"
+.br
+.TP
+.I dnsmasq
+this plugin uses dnsmasq to provide local caching nameserver functionality.
+.RE
 .SS [keyfile]
 This section contains keyfile-specific options and thus only has effect when using \fIkeyfile\fP plugin.
 .TP