From c8c62dba0b9b1465bb06b2c3355246a1066bb65c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Nov 2006 17:27:43 +0000
Subject: [PATCH] * Remove /etc/mtab.

svn path=/nixu/trunk/; revision=7094
---
 test/boot-stage-2-init.sh | 2 ++
 test/installer.sh         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index 0c7a105c3a1..bda2bfdb64d 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -21,6 +21,8 @@ done
 
 # Mount special file systems, initialise required directories.
 
+rm -f /etc/mtab
+
 if test -z "@readOnlyRoot@"; then
     #rootDev=$(grep "/dev/.* / " /proc/mounts | sed 's/^\([^ ]*\) .*/\1/')
     mount -o remount,rw /dontcare / # !!! check for failure
diff --git a/test/installer.sh b/test/installer.sh
index be20b3095b8..8e438f5388c 100644
--- a/test/installer.sh
+++ b/test/installer.sh
@@ -118,7 +118,7 @@ chroot $mountPoint @nix@/bin/nix-pull $nixpkgsURL/MANIFEST
 
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
-    -f "/mnt/$nixExpr" -i system-configuration
+    -f "/mnt/$nixExpr" -i -A systemConfiguration
 
 
 # Grub needs a mtab.