summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2014-12-16 13:00:28 +0100
committerJiří Klimeš <jklimes@redhat.com>2015-01-15 13:03:13 +0100
commita3c52d7a3322c9fbe91503a450de665882074727 (patch)
treea91cf47aae3b2bbde6330745961cec6d2f5fddc0 /man
parentc8fe3bbabcbe6bb64c53a4431ffb096a826a7559 (diff)
downloadNetworkManager-a3c52d7a3322c9fbe91503a450de665882074727.tar.gz
man: add description of BOOTPROTO to nm-settings-ifcfg-rh manpage
Diffstat (limited to 'man')
-rw-r--r--man/nm-settings-ifcfg-rh.xsl12
1 files changed, 11 insertions, 1 deletions
diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl
index f76dee759d..e0e3eb9a09 100644
--- a/man/nm-settings-ifcfg-rh.xsl
+++ b/man/nm-settings-ifcfg-rh.xsl
@@ -243,11 +243,21 @@ DEVICETYPE=TeamPort
nameservers to resolv.conf".</para>
</listitem>
<listitem>
- <para><literal>ONBOOT</literal> -
+ <para><literal>ONBOOT</literal> -
initscripts use ONBOOT=yes to mark the devices that are to be activated
during boot. NetworkManager extents this to also mean that this profile
can be used for auto-connecting at any time.</para>
</listitem>
+ <listitem>
+ <para><literal>BOOTPROTO</literal> -
+ NetworkManager supports traditional values <emphasis>none</emphasis> (static),
+ <emphasis>dhcp</emphasis>. But it also allows additional values to
+ enable new addressing methods. They are <emphasis>autoip</emphasis> for IPv4
+ link-local addressing using Avahi daemon and <emphasis>shared</emphasis> for
+ connection sharing. When <emphasis>shared</emphasis> is used, NetworkManager
+ assigns the interface 10.42.0.1, or it uses the first static address,
+ if configured.</para>
+ </listitem>
</itemizedlist>
</para></listitem>
</varlistentry>