fix(matrix): address argus review — drop in-code issue tag + dead nameservers
- remove the (#1500) issue tag from the resolv.conf source comment (no-NNN-in-code rule; context lives in the commit/PR/issue link) - drop networking.nameservers from the network.enable branch: resolvconf is disabled, so nothing reads it to synthesise resolv.conf — the static environment.etc."resolv.conf" is the sole source. eval output unchanged (nameserver <bridgeIp> + options edns0), confirming it was dead config.
This commit is contained in:
parent
2efd9c4944
commit
0d92a6028c
1 changed files with 4 additions and 2 deletions
|
|
@ -352,7 +352,7 @@ in
|
|||
# The earlier fix turned host-tracking off and trusted resolvconf
|
||||
# to honour `networking.nameservers` — but that's a RUNTIME
|
||||
# resolvconf behaviour, not verifiable at eval time, and it STILL
|
||||
# came up empty in practice (#1500). So take resolvconf out of the
|
||||
# came up empty in practice. So take resolvconf out of the
|
||||
# loop entirely and write a STATIC `/etc/resolv.conf` from
|
||||
# `bridgeIp` that nothing regenerates. Eval-proven: the generated
|
||||
# `environment.etc."resolv.conf".text` is `nameserver <bridgeIp>`.
|
||||
|
|
@ -362,9 +362,11 @@ in
|
|||
# resolv.conf. See `docs/network.md`.
|
||||
networking = lib.mkMerge [
|
||||
(lib.mkIf networkCfg.enable {
|
||||
# resolvconf is taken out of the loop entirely; the static
|
||||
# `environment.etc."resolv.conf"` below is the sole source of
|
||||
# the resolver file (no `nameservers` — nothing would read it).
|
||||
useHostResolvConf = lib.mkForce false;
|
||||
resolvconf.enable = lib.mkForce false;
|
||||
nameservers = [ networkCfg.bridgeIp ];
|
||||
})
|
||||
(lib.mkIf (!networkCfg.enable) {
|
||||
useHostResolvConf = true;
|
||||
|
|
|
|||
Loading…
Reference in a new issue