From e32a8437d59e0c480ab52f752503a9d7b3ba39a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Mar 2008 12:58:14 +0000
Subject: [PATCH] svn path=/nixos/trunk/; revision=11203

---
 configuration/rescue-cd.nix    | 4 ++++
 helpers/make-iso9660-image.nix | 2 +-
 installer/default.nix          | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 112b2d539c86..407dfa9ad4b1 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -235,6 +235,10 @@ rec {
     default 0
     timeout 10
     splashimage /boot/background.xpm.gz
+
+    title Boot from hard disk
+      root (hd0)
+      chainloader +1
     
     title NixOS Installer / Rescue
       kernel /boot/vmlinuz ${toString system.config.boot.kernelParams}
diff --git a/helpers/make-iso9660-image.nix b/helpers/make-iso9660-image.nix
index d2ecf5e1a90c..5e0bca4c630c 100644
--- a/helpers/make-iso9660-image.nix
+++ b/helpers/make-iso9660-image.nix
@@ -48,5 +48,5 @@ stdenv.mkDerivation {
     map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
   exportBuildReferencesGraph =
     map (x: [("closure-build-" + baseNameOf x.object) x.object]) buildStoreContents;
-  pathsFromGraph = ../../nixpkgs/pkgs/build-support/kernel/paths-from-graph.pl;
+  pathsFromGraph = ../pkgs/build-support/kernel/paths-from-graph.pl;
 }
diff --git a/installer/default.nix b/installer/default.nix
index 2196890f8420..ef2f4fd678fb 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -19,7 +19,7 @@ in
     inherit nix;
     nixpkgsURL = config.installer.nixpkgsURL;
 
-    pathsFromGraph = ../../nixpkgs/pkgs/build-support/kernel/paths-from-graph.pl;
+    pathsFromGraph = ../pkgs/build-support/kernel/paths-from-graph.pl;
 
     nixClosure = pkgs.runCommand "closure"
       {exportReferencesGraph = ["refs" nix];}