From 17cc5ecc474d86e2c00eaef8e7e4ea7002e30096 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 Feb 2007 22:33:44 +0000
Subject: [PATCH] * Add OpenSSH and pciutils to the boot environment.

svn path=/nixos/trunk/; revision=7918
---
 doc/manual/development.xml | 3 ++-
 system/options.nix         | 4 ++--
 system/system.nix          | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 58924658ca6d..6f61068d0b65 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -19,7 +19,8 @@ $ nix-build system/system.nix \
     -A <replaceable>attr</replaceable></screen>
 
 where <replaceable>attr</replaceable> is an attribute in
-system/system.nix (e.g., <literal>bootStage1</literal>).</para>
+<filename>system/system.nix</filename> (e.g.,
+<literal>bootStage1</literal>).</para>
 
 </section>
 
diff --git a/system/options.nix b/system/options.nix
index 56bb1fb67633..65eeda5eb924 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -33,8 +33,8 @@
     name = ["boot" "readOnlyRoot"];
     default = false;
     description = "
-      Whether the root device should be mounted writable.  This should
-      be set when booting from CD-ROM.
+      Whether the root device is read-only.  This should be set when
+      booting from CD-ROM.
     ";
   }
 
diff --git a/system/system.nix b/system/system.nix
index 0fbe3ad7c651..02410482e8e6 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -179,6 +179,8 @@ rec {
     pkgs.netcat
     pkgs.nettools
     pkgs.ntp
+    pkgs.openssh
+    pkgs.pciutils
     pkgs.perl
     pkgs.procps
     pkgs.pwdutils