diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-06-16 00:19:43 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-06-16 00:19:43 -0400 |
| commit | 4a95f8996b11ca9876e24a37d4b521925a1c33bf (patch) | |
| tree | 4bf43b804b32f0ce2266b37b04767dcf5922e705 /modules/system/boot/systemd.nix | |
| parent | 66f4d108437e62659e77fe11583ae53a23c54b74 (diff) | |
| download | nixpkgs-4a95f8996b11ca9876e24a37d4b521925a1c33bf.tar nixpkgs-4a95f8996b11ca9876e24a37d4b521925a1c33bf.tar.gz nixpkgs-4a95f8996b11ca9876e24a37d4b521925a1c33bf.tar.bz2 nixpkgs-4a95f8996b11ca9876e24a37d4b521925a1c33bf.tar.lz nixpkgs-4a95f8996b11ca9876e24a37d4b521925a1c33bf.tar.xz nixpkgs-4a95f8996b11ca9876e24a37d4b521925a1c33bf.tar.zst nixpkgs-4a95f8996b11ca9876e24a37d4b521925a1c33bf.zip | |
To ease migration to systemd, generate units from the ‘jobs’ option
Also get rid of the ‘buildHook’ job option because it wasn't very useful.
Diffstat (limited to 'modules/system/boot/systemd.nix')
| -rw-r--r-- | modules/system/boot/systemd.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix index 0d4256990e7..c5a646208cb 100644 --- a/modules/system/boot/systemd.nix +++ b/modules/system/boot/systemd.nix @@ -111,7 +111,7 @@ let nixosUnits = mapAttrsToList makeUnit config.boot.systemd.units; - systemUnits = pkgs.runCommand "system-units" { } + units = pkgs.runCommand "units" { preferLocalBuild = true; } '' mkdir -p $out/system for i in ${toString upstreamUnits}; do @@ -161,10 +161,12 @@ in system.build.systemd = systemd; + system.build.units = units; + environment.systemPackages = [ systemd ]; environment.etc = - [ { source = systemUnits; + [ { source = units; target = "systemd"; } ]; @@ -177,7 +179,7 @@ in After=multi-user.target Conflicts=rescue.target AllowIsolate=yes - Wants=sshd.service autovt@tty1.service # FIXME + Wants=sshd.service ''; boot.systemd.units."getty@.service" = |