From f99fe41f65911e7123cb9e32ac62bb7acb77b08d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 May 2009 10:18:54 +0000
Subject: [PATCH] svn path=/nixos/branches/modular-nixos/; revision=15670

---
 default.nix           | 4 +++-
 upstart-jobs/sshd.nix | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index 6dca88241a58..9dd73430b668 100644
--- a/default.nix
+++ b/default.nix
@@ -3,8 +3,10 @@ let
   fromEnv = name: default:
     let env = builtins.getEnv name; in
     if env == "" then default else env;
+    
   configuration = import (fromEnv "NIXOS_CONFIG" /etc/nixos/configuration.nix);
-  nixpkgs   =         fromEnv "NIXPKGS"      /etc/nixos/nixpkgs;
+  
+  nixpkgs = fromEnv "NIXPKGS" /etc/nixos/nixpkgs;
 
   system = import system/system.nix { inherit configuration nixpkgs; };
 
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index d6c06b24f7e3..38ccb2c19a19 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -87,6 +87,7 @@ let
 
   sshdUid = (import ../system/ids.nix).uids.sshd;
 
+  # !!! is this assertion evaluated anywhere???
   assertion = cfg.permitRootLogin == "yes" ||
        cfg.permitRootLogin == "without-password" ||
        cfg.permitRootLogin == "forced-commands-only" ||