Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[19.09] nixos/networkmanager: fix merging options #72951

Merged
merged 1 commit into from Nov 7, 2019

Conversation

@jtojnar
Copy link
Contributor

jtojnar commented Nov 6, 2019

Backports: #72916

Incorrect merging of modules resulted in dhcpcd being enabled causing flaky network connection.

#64364

Fixing it uncovered an infinite recursion from the same commit, previously masked by the incorrect merge.

While this is not a problem in 19.09, we can still drop the mkDefault for networking.wireless.enable as it is already false by default.

Closes: #72416

(cherry picked from commit 894fdfa)

Incorrect merging of modules resulted in dhcpcd being enabled causing flaky network connection.

#64364

Fixing it uncovered an infinite recursion from the same commit, previously masked by the incorrect merge.

While this is not a problem in 19.09, we can still drop the `mkDefault` for `networking.wireless.enable` as it is already `false` by default.

Closes: #72416

(cherry picked from commit 894fdfa)
@jtojnar jtojnar changed the title nixos/networkmanager: fix merging options [19.09] nixos/networkmanager: fix merging options Nov 6, 2019
@jtojnar jtojnar requested review from worldofpeace and JohnAZoidberg Nov 6, 2019
@worldofpeace

This comment has been minimized.

Copy link
Member

worldofpeace commented Nov 7, 2019

Testing now, otherwise LGTM.

Copy link
Member

worldofpeace left a comment

I've tested building the configuration from the gnome3 test doing

systemctl status dhcpcd.service

Before this change the output I got was:

Nov 07 00:51:12 nixos dhcpcd[559]: Failed to reload-or-try-restart chronyd.service: Unit chronyd.service not found.
Nov 07 00:51:12 nixos dhcpcd[559]: forked to background, child pid 848
Nov 07 00:51:12 nixos systemd[1]: Started DHCP Client.
Nov 07 00:51:12 nixos dhcpcd[848]: eth0: Router Advertisement from fe80::2
Nov 07 00:51:12 nixos dhcpcd[848]: eth0: adding address fec0::1bde:24f5:4889:63d3/64
Nov 07 00:51:12 nixos dhcpcd[848]: eth0: adding route to fec0::/64
Nov 07 00:51:12 nixos dhcpcd[848]: eth0: adding default route via fe80::2
Nov 07 00:51:12 nixos dhcpcd[848]: eth0: pid 0 deleted address fec0::1bde:24f5:4889:63d3/64
Nov 07 00:51:12 nixos dhcpcd[848]: eth0: deleting default route via fe80::2
Nov 07 00:51:12 nixos dhcpcd[848]: eth0: adding default route via fe80::2

And the unit was active.

With this change it does not exist 👍

@worldofpeace worldofpeace merged commit 5b66838 into NixOS:release-19.09 Nov 7, 2019
12 checks passed
12 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@worldofpeace worldofpeace deleted the jtojnar:nm-prope-merge branch Nov 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.