From 181f4bee26174615619b954b26da3bdf2192ac88 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 15 Dec 2009 23:26:55 +0000 Subject: [PATCH] fix nixos-intall(2). Now the configuration is built correctly. Passing --arg configuration does no longer work! svn path=/nixos/trunk/; revision=18983 --- modules/installer/tools/installer2/nixos-bootstrap.sh | 1 - modules/installer/tools/nixos-install.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/modules/installer/tools/installer2/nixos-bootstrap.sh b/modules/installer/tools/installer2/nixos-bootstrap.sh index ad9baad4dd7..9c972bd6d95 100644 --- a/modules/installer/tools/installer2/nixos-bootstrap.sh +++ b/modules/installer/tools/installer2/nixos-bootstrap.sh @@ -118,7 +118,6 @@ INFO "building the system configuration..." @nix@/bin/nix-env \ -p /nix/var/nix/profiles/system \ -f "$NIXOS" \ - --arg configuration "import $NIXOS_CONFIG" \ --set -A system \ $NIX_ENV_ARGS diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh index 5ae1a89b52f..43d84aba032 100644 --- a/modules/installer/tools/nixos-install.sh +++ b/modules/installer/tools/nixos-install.sh @@ -152,7 +152,6 @@ echo "building the system configuration..." NIXPKGS=/mnt/etc/nixos/nixpkgs chroot $mountPoint @nix@/bin/nix-env \ -p /nix/var/nix/profiles/system \ -f "/mnt$NIXOS" \ - --arg configuration "import $NIXOS_CONFIG" \ --set -A system