From 3ef1432866f7b35adbd4a8b78b25ad0cf61c2fb4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 18 Dec 2012 13:44:47 -0500
Subject: [PATCH] Update create-s3-amis and amazon-image.nix to recent nixos

---
 maintainers/scripts/ec2/create-s3-amis.sh | 5 +++--
 modules/virtualisation/amazon-image.nix   | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/ec2/create-s3-amis.sh b/maintainers/scripts/ec2/create-s3-amis.sh
index ac92c69f5bb9..767696cfe55e 100755
--- a/maintainers/scripts/ec2/create-s3-amis.sh
+++ b/maintainers/scripts/ec2/create-s3-amis.sh
@@ -1,6 +1,7 @@
 #! /bin/sh -e
 
-revision=$(svnversion "$NIXOS")
+nixos=$(nix-instantiate --find-file nixos)
+revision=$(cd $nixos; git rev-parse --short HEAD)
 echo "NixOS revision is $revision"
 
 buildAndUploadFor() {
@@ -8,7 +9,7 @@ buildAndUploadFor() {
     arch="$2"
 
     echo "building $system image..."
-    NIXOS_CONFIG=$NIXOS/modules/virtualisation/amazon-config.nix nix-build "$NIXOS" \
+    NIXOS_CONFIG=$nixos/modules/virtualisation/amazon-config.nix nix-build "$nixos" \
         -A config.system.build.amazonImage --argstr system "$system" -o ec2-ami
 
     ec2-bundle-image -i ./ec2-ami/nixos.img --user "$AWS_ACCOUNT" --arch "$arch" \
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 79fb435db386..38885d12b35c 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -50,6 +50,10 @@ with pkgs.lib;
           mkdir -p /mnt/etc
           touch /mnt/etc/NIXOS
 
+          # `switch-to-configuration' requires a /bin/sh
+          mkdir -p /mnt/bin
+          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
+
           # Install a configuration.nix.
           mkdir -p /mnt/etc/nixos
           cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix