* nixos-installer -> nixos-install.

svn path=/nixos/trunk/; revision=7852

README

@@ -58,7 +58,7 @@
 
 - Do the installation:
 
-  $ nixos-installer.sh ROOTDIR . my-config.nix
+  $ nixos-install.sh ROOTDIR . my-config.nix
 
   where ROOTDIR is the mount point of the target root device (i.e.,
   boot.rootDevice in your configuration).
@@ -131,9 +131,9 @@ To get out of maintenance mode:
 
 - Testing the installer:
 
-  $ nix-build configuration/rescue-cd.nix -A system.nixosInstaller
+  $ nix-build configuration/rescue-cd.nix -A system.nixosInstall
   $ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1
   $ yes | mke2fs -j diskimage
   $ mount -o loop diskimage /mnt
-  $ ./result/bin/nixos-installer
+  $ ./result/bin/nixos-install
 

installer/nixos-install.nix

@@ -5,8 +5,8 @@
 }:
 
 substituteAll {
-  name = "nixos-installer";
+  name = "nixos-install";
-  src = ./nixos-installer.sh;
+  src = ./nixos-install.sh;
   dir = "bin";
   isExecutable = true;
   inherit nix nixpkgsURL perl;

system/system.nix

@@ -110,7 +110,7 @@ rec {
 
 
   # The installer.
-  nixosInstaller = import ../installer/nixos-installer.nix {
+  nixosInstall = import ../installer/nixos-install.nix {
     inherit (pkgs) stdenv perl runCommand substituteAll;
     inherit nix;
     nixpkgsURL = config.get ["installer" "nixpkgsURL"];
@@ -185,7 +185,7 @@ rec {
     pkgs.utillinux
 #    pkgs.vim
     nix
-    nixosInstaller
+    nixosInstall
     setuidWrapper
   ];