[19.09] nixos/networkmanager: fix merging options #72951
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Incorrect merging of modules resulted in dhcpcd being enabled causing flaky network connection. NixOS#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: NixOS#72416 (cherry picked from commit 894fdfa)
jtojnar
changed the title
|
Testing now, otherwise LGTM. |
worldofpeace
approved these changes
Nov 7, 2019
There was a problem hiding this 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
added
the
8.has: port to stable
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
mkDefaultfornetworking.wireless.enableas it is alreadyfalseby default.Closes: #72416
(cherry picked from commit 894fdfa)