diff options
author | Robin Gloster <mail@glob.in> | 2019-09-24 09:36:49 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2019-09-24 10:20:17 +0200 |
commit | e862dd637350ddd1812a6c1fb5811c6464e74ff5 (patch) | |
tree | 5271dced2edf95174a87d647524489569a7d7a1e /nixos | |
parent | c26c6241eae93985c33590401fda971d7574c136 (diff) | |
download | nixlib-e862dd637350ddd1812a6c1fb5811c6464e74ff5.tar nixlib-e862dd637350ddd1812a6c1fb5811c6464e74ff5.tar.gz nixlib-e862dd637350ddd1812a6c1fb5811c6464e74ff5.tar.bz2 nixlib-e862dd637350ddd1812a6c1fb5811c6464e74ff5.tar.lz nixlib-e862dd637350ddd1812a6c1fb5811c6464e74ff5.tar.xz nixlib-e862dd637350ddd1812a6c1fb5811c6464e74ff5.tar.zst nixlib-e862dd637350ddd1812a6c1fb5811c6464e74ff5.zip |
networking.useDHCP: add release notes and docs
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1909.xml | 8 | ||||
-rw-r--r-- | nixos/modules/tasks/network-interfaces.nix | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 58ab7207f533..012c2e4f9929 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -484,6 +484,14 @@ (<literal>citrix_workspace</literal>). </para> </listitem> + <listitem> + <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.<name>.useDHCP = true;</option> + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 5bf7b0d227f0..834ce758410d 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -903,6 +903,11 @@ in Whether to use DHCP to obtain an IP address and other configuration for all network interfaces that are not manually configured. + + Using this option is highly discouraged and also incompatible with + <option>networking.useNetworkd</option>. Please use + <option>networking.interfaces.<name>.useDHCP</option> instead + and set this to false. ''; }; |