Unverified Commit 0ee2243b authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

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

nixos/virtualisation: increase priority for libvirt NSS modules
parents 8b864a70 cae086d6

nixos/modules/system/boot/systemd.nix

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ in 
    system.nssModules = [ cfg.package.out ];

    system.nssDatabases = {

      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

      ]);

      passwd = (mkMerge [

nixos/modules/virtualisation/libvirtd.nix

+4 −3
Original line number Diff line number Diff line
@@ -545,9 +545,10 @@ in 
    };



    system.nssModules = optional (cfg.nss.enable or cfg.nss.enableGuest) cfg.package;

    system.nssDatabases.hosts = builtins.concatLists [

      (optional cfg.nss.enable "libvirt")

      (optional cfg.nss.enableGuest "libvirt_guest")

    system.nssDatabases.hosts = mkMerge [

      # ensure that the NSS modules come between mymachines (which is 400) and resolve (which is 501)

      (mkIf cfg.nss.enable (mkOrder 430 [ "libvirt" ]))

      (mkIf cfg.nss.enableGuest (mkOrder 432 [ "libvirt_guest" ]))

    ];

  };

}