diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix index 72d3bcad380..e580343baad 100644 --- a/configuration/rescue-cd.nix +++ b/configuration/rescue-cd.nix @@ -1,7 +1,7 @@ rec { - nixpkgsRel = "nixpkgs-0.11pre7628"; + nixpkgsRel = "nixpkgs-0.11pre7785"; configuration = { @@ -106,7 +106,7 @@ rec { # Get a recent copy of Nixpkgs. nixpkgsTarball = pkgs.fetchurl { url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2"; - md5 = "e7fe1793e69ff5072eb5987e7b7ccd47"; + md5 = "0f554f092d94cc2cb7fe1e5c09f26adc"; }; diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh index 0032cce3507..ac62d81bd13 100644 --- a/installer/nixos-installer.sh +++ b/installer/nixos-installer.sh @@ -20,7 +20,7 @@ nixosDir="$2" configuration="$3" if test -z "$mountPoint" -o -z "$nixosDir" -o -z "$configuration"; then - echo "Syntax: installer.sh " + echo "Syntax: nixos-installer.sh " exit 1 fi @@ -117,7 +117,7 @@ cp /etc/resolv.conf $mountPoint/etc/ # the CD can be copied directly. echo "registering substitutes to speed up builds..." chroot $mountPoint @nix@/bin/nix-store --clear-substitutes -chroot $mountPoint @nix@/bin/nix-pull /mnt/MANIFEST +chroot $mountPoint @nix@/bin/nix-pull file:///mnt/MANIFEST rm -f $mountPoint/tmp/inst-store ln -s /mnt/nix/store $mountPoint/tmp/inst-store diff --git a/upstart-jobs/swraid.nix b/upstart-jobs/swraid.nix index f62bccbf967..3a3328eb1f0 100644 --- a/upstart-jobs/swraid.nix +++ b/upstart-jobs/swraid.nix @@ -2,7 +2,7 @@ let - tempConf = "/var/state/mdadm.conf"; + tempConf = "/var/run/mdadm.conf"; in