From 8c27201ce0170a0fb38e5c808f359cea2bbcbe2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 31 Oct 2010 19:34:39 +0000 Subject: [PATCH] Fixing mkOverride and openssh things on system-tarballs svn path=/nixos/branches/stdenv-updates/; revision=24554 --- modules/installer/cd-dvd/system-tarball-fuloong2f.nix | 2 +- modules/installer/cd-dvd/system-tarball-pc.nix | 2 +- modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix index 41386069e73..7ece0716df6 100644 --- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix +++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix @@ -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; diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix index 62b32c48144..a67f60a2c34 100644 --- a/modules/installer/cd-dvd/system-tarball-pc.nix +++ b/modules/installer/cd-dvd/system-tarball-pc.nix @@ -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 {} ""; } diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index f50d4353b34..77e09ec2265 100644 --- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -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;