From cfb80376641fa49137b9996130352697e7f8b436 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Wed, 25 Aug 2021 15:23:22 +0200
Subject: New upstream version 1.32.10

---
 man/nm-initrd-generator.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'man/nm-initrd-generator.xml')

diff --git a/man/nm-initrd-generator.xml b/man/nm-initrd-generator.xml
index 2cee98fb..503700fa 100644
--- a/man/nm-initrd-generator.xml
+++ b/man/nm-initrd-generator.xml
@@ -142,10 +142,12 @@
             <member><option>bond</option></member>
             <member><option>team</option></member>
             <member><option>vlan</option></member>
+            <member><option>ib.pkey</option></member>
             <member><option>bootdev</option></member>
             <member><option>nameserver</option></member>
             <member><option>rd.peerdns</option></member>
             <member><option>rd.bootif</option></member>
+            <member><option>rd.ethtool</option></member>
             <member><option>rd.net.timeout.dhcp</option></member>
             <member><option>rd.net.timeout.carrier</option></member>
             <member><option>rd.znet</option></member>
@@ -184,6 +186,31 @@
         the command line wins.</para>
       </listitem>
 
+      <listitem>
+        <para>NetworkManager supports the
+        <option>ib.pkey</option>=<replaceable>PARENT</replaceable>.<replaceable>PKEY</replaceable>
+        argument to set up an Infiniband partition on IPoIB parent
+        device <replaceable>PARENT</replaceable> using the specified
+        partition key <replaceable>PKEY</replaceable>. The partition
+        key must be in hexadecimal notation without leading "0x", for
+        example "ib.pkey=ib0.8004".
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>NetworkManager supports the 
+        <option>rd.ethtool</option>=<replaceable>INTERFACE</replaceable>:<replaceable>AUTONEG</replaceable>:<replaceable>SPEED</replaceable> 
+        kernel command line option to set up ethtool NIC configuration parameters 
+        <replaceable>AUTONEG</replaceable> and <replaceable>SPEED</replaceable>. 
+        The <replaceable>INTERFACE</replaceable> being configured must be 
+        specified, and the other parameters are optional and can be left blank. 
+        When <replaceable>SPEED</replaceable> is set, duplex mode is 
+        automatically set to 'full'. <replaceable>INTERFACE</replaceable> 
+        accepts string values, <replaceable>AUTONEG</replaceable> accepts 
+        boolean values (true and false / on or off / 0 or 1), and 
+        <replaceable>SPEED</replaceable> accepts positive integer values.
+        </para>
+      </listitem>
     </itemizedlist>
   </refsect1>
 
-- 
cgit 1.3.0-6-gf8a5