about summary refs log tree commit diff
path: root/nixos/doc/manual/release-notes
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2019-10-07 11:29:04 +0200
committerGitHub <noreply@github.com>2019-10-07 11:29:04 +0200
commit0b754fbe542a8455d707516188cb3471663b629e (patch)
tree71154cf737e235ffa0974c0cecfc7595a843c82e /nixos/doc/manual/release-notes
parentda089d7d401f99e1c6ccaf5c017878d33260b4e0 (diff)
parent68b42a84fdd167e358ec9f76c40ff3907d0c3c2e (diff)
downloadnixlib-0b754fbe542a8455d707516188cb3471663b629e.tar
nixlib-0b754fbe542a8455d707516188cb3471663b629e.tar.gz
nixlib-0b754fbe542a8455d707516188cb3471663b629e.tar.bz2
nixlib-0b754fbe542a8455d707516188cb3471663b629e.tar.lz
nixlib-0b754fbe542a8455d707516188cb3471663b629e.tar.xz
nixlib-0b754fbe542a8455d707516188cb3471663b629e.tar.zst
nixlib-0b754fbe542a8455d707516188cb3471663b629e.zip
Merge pull request #69302 from mayflower/networkd-disallow-dhcp
networkd: disallow useDHCP
Diffstat (limited to 'nixos/doc/manual/release-notes')
-rw-r--r--nixos/doc/manual/release-notes/rl-1909.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 66f803ac4428..6b2488a6a8db 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -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>