From c5ab0cec9f0a4622ba96a40bf2dc3c5e29e42d5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Dec 2006 00:10:28 +0000
Subject: [PATCH] * More installer fixes.

svn path=/nixos/trunk/; revision=7359
---
 installer/nixos-installer.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index e2ab51599f93..c39d5ea698d5 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -123,17 +123,17 @@ fi
 
 chroot $mountPoint @nix@/bin/nix-env \
     -p /nix/var/nix/profiles/system \
-    -f "/mnt/$nixosDir/configuration/system.nix" \
-    --arg configuration "import /mnt/$configuration" \
+    -f "/mnt$nixosDir/configuration/system.nix" \
+    --arg configuration "import /mnt$configuration" \
     --set -A system
 
 
 # Copy the configuration to /etc/nixos.
-if test -e $mountPoint/etc/nixos/configuration.nix; then
-    mv $mountPoint/etc/nixos/configuration.nix \
-       $mountPoint/etc/nixos/configuration.backup-$(date "+%Y%m%d%H%M%S").nix
+targetConfig=$mountPoint/etc/nixos/configuration.nix
+if test -e $targetConfig -o -L $targetConfig; then
+    mv $targetConfig $targetConfig.backup-$(date "+%Y%m%d%H%M%S")
 fi
-cp $configuration $mountPoint/etc/nixos/configuration.nix
+cp $configuration $targetConfig
 
 
 # Grub needs a mtab.
@@ -149,4 +149,5 @@ touch $mountPoint/etc/NIXOS
 # a menu default pointing at the kernel/initrd/etc of the new
 # configuration.
 echo "finalising the installation..."
-NIXOS_INSTALL_GRUB=1 chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration
+NIXOS_INSTALL_GRUB=1 chroot $mountPoint \
+    /nix/var/nix/profiles/system/bin/switch-to-configuration boot