From 35abca4e7a75386fd664edf5e54d50f1aa4b0794 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 16 Oct 2009 04:27:59 +0000
Subject: [PATCH] Forward-port sshd fixes to iso-minimal-fresh-kernel. By the
 way, maybe we should finalyy decide what to do with kernel update and
 corresponding ISO update (to fresh-kernel proposal or otherwise)

svn path=/nixos/trunk/; revision=17840
---
 .../cd-dvd/installation-cd-minimal-fresh-kernel.nix         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
index f3f0a9fe50d..70e15fce39f 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
@@ -8,6 +8,12 @@ rec {
 
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix";
 
+  # Allow sshd to be started manually through "start sshd".  It should
+  # not be started by default on the installation CD because the
+  # default root password is empty.
+  services.sshd.enable = true;
+  jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
+
   # Don't include X libraries.
   environment.noXlibs = true;