From 9e29c72bd2adf992980acb53ad851294c5a485f8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 24 Feb 2009 16:19:29 +0000
Subject: [PATCH] Automated install is once more succesful

svn path=/nixos/trunk/; revision=14229
---
 installer/cd-dvd/remote-install-scripts/install-script.sh | 2 +-
 installer/cd-dvd/remote-install-scripts/install-test.sh   | 2 +-
 installer/cd-dvd/rescue-cd-configurable.nix               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/installer/cd-dvd/remote-install-scripts/install-script.sh b/installer/cd-dvd/remote-install-scripts/install-script.sh
index fbacf6ff6a5..574cdb40a22 100755
--- a/installer/cd-dvd/remote-install-scripts/install-script.sh
+++ b/installer/cd-dvd/remote-install-scripts/install-script.sh
@@ -14,7 +14,7 @@ mkdir -p /mnt/etc/nixos
 
 cat > /mnt/etc/nixos/configuration.nix <<EOF
 
-pkgs: full_configuration: {
+{pkgs, config, ...}: {
   boot = {
     grubDevice = "/dev/sda";
     copyKernels = true;
diff --git a/installer/cd-dvd/remote-install-scripts/install-test.sh b/installer/cd-dvd/remote-install-scripts/install-test.sh
index b9c135b8865..8b68c6a3bb1 100755
--- a/installer/cd-dvd/remote-install-scripts/install-test.sh
+++ b/installer/cd-dvd/remote-install-scripts/install-test.sh
@@ -17,7 +17,7 @@ set -x
 echo "Installation starting.." > report
 
 nix-build -o socat /etc/nixos/nixpkgs -A socat || { echo "Failed to build socat" >&2 ;  exit 2; };
-nix-build -o qemu /etc/nixos/nixpkgs -A qemu || { echo "Failed to build qemu" >&2 ;  exit 2; };
+nix-build -o qemu /etc/nixos/nixpkgs -A ${QEMU_PACKAGE:-qemu} || { echo "Failed to build qemu" >&2 ;  exit 2; };
 
 echo "reboot" | ./socat/bin/socat tcp-listen:4424 stdio >> report &  
 
diff --git a/installer/cd-dvd/rescue-cd-configurable.nix b/installer/cd-dvd/rescue-cd-configurable.nix
index e727d2d1f2d..f021c19b63b 100644
--- a/installer/cd-dvd/rescue-cd-configurable.nix
+++ b/installer/cd-dvd/rescue-cd-configurable.nix
@@ -137,7 +137,7 @@ rec {
 
   nixpkgsRel = "nixpkgs" + (if networkNixpkgs != "" then "-" + networkNixpkgs else "");
  
-  configuration = pkgs: final_configuration: let preConfiguration ={
+  configuration = {pkgs, config, ...}: let preConfiguration ={
     boot = {
       isLiveCD = true;
       # The label used to identify the installation CD.
@@ -164,8 +164,8 @@ rec {
 
       udev = {
         addFirmware = []
-	  ++ (pkgs.lib.optional intel3945FWEnable pkgs.iwlwifi3945ucode)
-	  ++ (pkgs.lib.optional intel4965FWEnable pkgs.iwlwifi4965ucode)
+	  #++ (pkgs.lib.optional intel3945FWEnable pkgs.iwlwifi3945ucode)
+	  #++ (pkgs.lib.optional intel4965FWEnable pkgs.iwlwifi4965ucode)
 	  ;
       };