nixos/networking: support static resolv.conf #32308
Merged
+2
−2
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.
Motivation for this change
This is necessary to support such use as:
When
/nix/store
is read-only this already works except thatresolvconf
warns that it can not update/etc/resolv.conf
; when/nix/store
is writable, without this changeresolvconf
corrupts the store.When
config.services.resolved.enable = true
,config.environment.etc."resolv.conf"
is defined, so keeping the old conditional is redundant:nixpkgs/nixos/modules/config/networking.nix
Lines 250 to 253 in f2b690a
Things done
I have tested this PR with all combination of settings:
services.resolved.enable = true | false
,environment.etc = { "resolv.conf" = } | { }
,services.dnsmasq.enable = true | false
. It does not break anything and works as intended.build-use-sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)