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

Fixing mkOverride and openssh things on system-tarballs

Browse Source 
svn path=/nixos/branches/stdenv-updates/; revision=24554
This commit is contained in:
Lluís Batlle i Rossell 2010-10-31 19:34:39 +00:00
parent 1acbc4a82f
commit 8c27201ce0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/installer/cd-dvd/system-tarball-fuloong2f.nix
View File

@ -177,7 +177,7 @@ in
# default root password is empty. # default root password is empty.
services.openssh.enable = true; services.openssh.enable = true;
jobs.openssh.startOn = pkgs.lib.mkOverride 50 {} ""; jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
services.ttyBackgrounds.enable = false; services.ttyBackgrounds.enable = false;

2
modules/installer/cd-dvd/system-tarball-pc.nix
View File

@ -34,5 +34,5 @@ in
# not be started by default on the installation CD because the # not be started by default on the installation CD because the
# default root password is empty. # default root password is empty.
services.openssh.enable = true; services.openssh.enable = true;
jobs.sshd.startOn = pkgs.lib.mkOverrideTemplate 50 {} ""; jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
} }

4
modules/installer/cd-dvd/system-tarball-sheevaplug.nix
View File

@ -22,7 +22,7 @@ let
# Add your own options below and run "nixos-rebuild switch". # Add your own options below and run "nixos-rebuild switch".
# E.g., # E.g.,
# services.sshd.enable = true; # services.openssh.enable = true;
} }
''; '';
@ -178,7 +178,7 @@ in
# default root password is empty. # default root password is empty.
services.openssh.enable = true; services.openssh.enable = true;
services.ttyBackgrounds.enable = false; services.ttyBackgrounds.enable = false;
jobs.openssh.startOn = pkgs.lib.mkOverride 50 {} ""; jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
nixpkgs.config = { nixpkgs.config = {
platform = pkgs.platforms.sheevaplug; platform = pkgs.platforms.sheevaplug;