gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #322980 from michaelfranzl/fix-nss-libvirt

Browse Source 
nixos/virtualisation: increase priority for libvirt NSS modules
This commit is contained in:
Florian Klink
2024-06-28 18:15:16 +03:00
committed by GitHub
parent 8b864a7078 cae086d605
commit 0ee2243bc8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/system/boot/systemd.nix
View File

@@ -489,7 +489,7 @@ in
system.nssModules = [ cfg.package.out ]; system.nssModules = [ cfg.package.out ];
system.nssDatabases = { system.nssDatabases = {
hosts = (mkMerge [ hosts = (mkMerge [
(mkOrder 400 ["mymachines"]) # 400 to ensure it comes before resolve (which is mkBefore'd) (mkOrder 400 ["mymachines"]) # 400 to ensure it comes before resolve (which is 501)
(mkOrder 999 ["myhostname"]) # after files (which is 998), but before regular nss modules (mkOrder 999 ["myhostname"]) # after files (which is 998), but before regular nss modules
]); ]);
passwd = (mkMerge [ passwd = (mkMerge [

7
nixos/modules/virtualisation/libvirtd.nix
View File

@@ -545,9 +545,10 @@ in
}; };
system.nssModules = optional (cfg.nss.enable or cfg.nss.enableGuest) cfg.package; system.nssModules = optional (cfg.nss.enable or cfg.nss.enableGuest) cfg.package;
system.nssDatabases.hosts = builtins.concatLists [ system.nssDatabases.hosts = mkMerge [
(optional cfg.nss.enable "libvirt") # ensure that the NSS modules come between mymachines (which is 400) and resolve (which is 501)
(optional cfg.nss.enableGuest "libvirt_guest") (mkIf cfg.nss.enable (mkOrder 430 [ "libvirt" ]))
(mkIf cfg.nss.enableGuest (mkOrder 432 [ "libvirt_guest" ]))
]; ];
}; };
} }