Author: viric
Date: Sun Oct 31 19:34:39 2010
New Revision: 24554
URL: https://svn.nixos.org/websvn/nix/?rev=24554&sc=1
Log:
Fixing mkOverride and openssh things on system-tarballs
Modified:
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-pc.nix
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
Modified:
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
==============================================================================
---
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
Sun Oct 31 19:30:31 2010 (r24553)
+++
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
Sun Oct 31 19:34:39 2010 (r24554)
@@ -177,7 +177,7 @@
# 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;
Modified:
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-pc.nix
==============================================================================
---
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-pc.nix
Sun Oct 31 19:30:31 2010 (r24553)
+++
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-pc.nix
Sun Oct 31 19:34:39 2010 (r24554)
@@ -34,5 +34,5 @@
# 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 {} "";
}
Modified:
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
==============================================================================
---
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
Sun Oct 31 19:30:31 2010 (r24553)
+++
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
Sun Oct 31 19:34:39 2010 (r24554)
@@ -22,7 +22,7 @@
# Add your own options below and run "nixos-rebuild switch".
# E.g.,
- # services.sshd.enable = true;
+ # services.openssh.enable = true;
}
'';
@@ -178,7 +178,7 @@
# 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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
