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

systemd.generators: Generate folders via environment.etc.

This commit is contained in:
Moritz Ulrich 2016-03-25 12:45:54 +01:00
parent 5c770c4c0b
commit e366d8294e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -636,11 +636,16 @@ in
environment.systemPackages = [ systemd ]; environment.systemPackages = [ systemd ];
environment.etc = let environment.etc = let
generators = (fold (p: attrs: let path = "${p}/lib/systemd/system-generators"; # generate contents for /etc/systemd/system-generators from
in attrs // (mapAttrs' (name: _: nameValuePair name "${path}/${toString name}") # systemd.generators and systemd.generator-packages
(builtins.readDir "${path}"))) generators = pkgs.runCommand "system-generators" { packages = cfg.generator-packages; } ''
cfg.generators mkdir -p $out
cfg.generator-packages); for package in $packages
do
ln -s $package/lib/systemd/system-generators/* $out/
done;
${concatStrings (mapAttrsToList (generator: target: "ln -s ${target} $out/${generator};\n") cfg.generators)}
'';
in ({ in ({
"systemd/system".source = generateUnits "system" cfg.units upstreamSystemUnits upstreamSystemWants; "systemd/system".source = generateUnits "system" cfg.units upstreamSystemUnits upstreamSystemWants;
@ -680,7 +685,9 @@ in
${concatStringsSep "\n" cfg.tmpfiles.rules} ${concatStringsSep "\n" cfg.tmpfiles.rules}
''; '';
} // mapAttrs' (n: v: nameValuePair "systemd/system-generators/${n}" {"source"=v;}) generators);
"systemd/system-generators" = { source = generators; };
});
system.activationScripts.systemd = stringAfter [ "groups" ] system.activationScripts.systemd = stringAfter [ "groups" ]
'' ''