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

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

@ -530,17 +530,14 @@ 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]
''; '';
target = "systemd/system.conf";
} environment.etc."systemd/journald.conf".text =
{ source = pkgs.writeText "journald.conf"
'' ''
[Journal] [Journal]
RateLimitInterval=${config.services.journald.rateLimitInterval} RateLimitInterval=${config.services.journald.rateLimitInterval}
@ -550,16 +547,12 @@ in
TTYPath=${config.services.journald.console} TTYPath=${config.services.journald.console}
''} ''}
''; '';
target = "systemd/journald.conf";
} environment.etc."systemd/logind.conf".text =
{ source = pkgs.writeText "logind.conf"
'' ''
[Login] [Login]
${config.services.logind.extraConfig} ${config.services.logind.extraConfig}
''; '';
target = "systemd/logind.conf";
}
];
system.activationScripts.systemd = system.activationScripts.systemd =
'' ''