From b674f74c2dbfe219e5829ebf619a67fa5b1dc77e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Feb 2007 21:06:59 +0000
Subject: [PATCH] * Installer fixes.

svn path=/nixos/trunk/; revision=7848
---
 configuration/rescue-cd.nix  | 1 +
 installer/nixos-installer.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index 4011191ab66e..65a99c7bbea6 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -32,6 +32,7 @@ rec {
           job = "
             start on startup
             script
+              export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
               mkdir -p /etc/nixos/nixos
               tar xjf /nixos.tar.bz2 -C /etc/nixos/nixos
               tar xjf /nixpkgs.tar.bz2 -C /etc/nixos
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index aa76ad4bdc54..7f0a5dbd77f7 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -28,7 +28,7 @@ if ! test -e "$mountPoint"; then
     exit 1
 fi
 
-if ! fgrep -q " $mountPoint " /proc/mounts; then
+if ! grep -F -q " $mountPoint " /proc/mounts; then
     echo "$mountPoint doesn't appear to be a mount point"
     exit 1
 fi