Merge pull request #69302 from mayflower/networkd-disallow-dhcp

networkd: disallow useDHCP
2019-10-07 11:29:04 +02:00
parent da089d7d40 68b42a84fd
commit 0b754fbe54
8 changed files with 60 additions and 9 deletions
@@ -512,6 +512,12 @@
       is set to <literal>/var/lib/gitlab/state</literal>, <literal>gitlab</literal> and all parent directories
       must be owned by either <literal>root</literal> or the user specified in <option>services.gitlab.user</option>.
     </para>
+     <para>
+      The <option>networking.useDHCP</option> option is unsupported in combination with
+      <option>networking.useNetworkd</option> in anticipation of defaulting to it by default.
+      It has to be set to <literal>false</literal> and enabled per
+      interface with <option>networking.interfaces.&lt;name&gt;.useDHCP = true;</option>
+    </para>
   </listitem>
   <listitem>
     <para>