mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-21 21:23:06 +00:00
Fixing mkOverride and openssh things on system-tarballs
svn path=/nixos/branches/stdenv-updates/; revision=24554
This commit is contained in:
parent
1acbc4a82f
commit
8c27201ce0
modules/installer/cd-dvd
@ -177,7 +177,7 @@ in
|
||||
# default root password is empty.
|
||||
services.openssh.enable = true;
|
||||
|
||||
jobs.openssh.startOn = pkgs.lib.mkOverride 50 {} "";
|
||||
jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
|
||||
|
||||
services.ttyBackgrounds.enable = false;
|
||||
|
||||
|
@ -34,5 +34,5 @@ in
|
||||
# not be started by default on the installation CD because the
|
||||
# default root password is empty.
|
||||
services.openssh.enable = true;
|
||||
jobs.sshd.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
|
||||
jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
|
||||
}
|
||||
|
@ -22,7 +22,7 @@ let
|
||||
|
||||
# Add your own options below and run "nixos-rebuild switch".
|
||||
# E.g.,
|
||||
# services.sshd.enable = true;
|
||||
# services.openssh.enable = true;
|
||||
}
|
||||
'';
|
||||
|
||||
@ -178,7 +178,7 @@ in
|
||||
# default root password is empty.
|
||||
services.openssh.enable = true;
|
||||
services.ttyBackgrounds.enable = false;
|
||||
jobs.openssh.startOn = pkgs.lib.mkOverride 50 {} "";
|
||||
jobs.openssh.startOn = pkgs.lib.mkOverrideTemplate 50 {} "";
|
||||
|
||||
nixpkgs.config = {
|
||||
platform = pkgs.platforms.sheevaplug;
|
||||
|
Loading…
Reference in New Issue
Block a user