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

systemd.nix: Use environment.etc attribute syntax

Browse Source
This commit is contained in:
Eelco Dolstra 2013-05-09 16:21:42 +02:00
parent 4e38d152ed
commit ebac0220d1
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
modules/system/boot/systemd.nix
View File

@ -530,36 +530,29 @@ in
environment.systemPackages = [ systemd ]; environment.systemPackages = [ systemd ];
environment.etc = environment.etc."systemd/system".source = units;
[ { source = units;
target = "systemd/system"; environment.etc."systemd/system.conf".text =
} ''
{ source = pkgs.writeText "systemd.conf" [Manager]
'' '';
[Manager]
''; environment.etc."systemd/journald.conf".text =
target = "systemd/system.conf"; ''
} [Journal]
{ source = pkgs.writeText "journald.conf" RateLimitInterval=${config.services.journald.rateLimitInterval}
'' RateLimitBurst=${toString config.services.journald.rateLimitBurst}
[Journal] ${optionalString (config.services.journald.console != "") ''
RateLimitInterval=${config.services.journald.rateLimitInterval} ForwardToConsole=yes
RateLimitBurst=${toString config.services.journald.rateLimitBurst} TTYPath=${config.services.journald.console}
${optionalString (config.services.journald.console != "") '' ''}
ForwardToConsole=yes '';
TTYPath=${config.services.journald.console}
''} environment.etc."systemd/logind.conf".text =
''; ''
target = "systemd/journald.conf"; [Login]
} ${config.services.logind.extraConfig}
{ source = pkgs.writeText "logind.conf" '';
''
[Login]
${config.services.logind.extraConfig}
'';
target = "systemd/logind.conf";
}
];
system.activationScripts.systemd = system.activationScripts.systemd =
'' ''