From 185e9b69ed9183c95a11239b4f38c03068860eb3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Apr 2012 16:48:01 +0000
Subject: [PATCH] * Assume that the ephemeral devices are called /dev/xvda-e. 
 So   in Charon deployments, non-ephemeral devices should be >= /dev/xvdf.

svn path=/nixos/trunk/; revision=33764
---
 modules/virtualisation/amazon-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index d2aaeec5bd6e..65bf43c1478a 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -91,7 +91,7 @@ with pkgs.lib;
     ''
       diskNr=0
       diskForAufs=
-      for device in /dev/xvd*; do
+      for device in /dev/xvd[abcde]*; do
           if [ "$device" = /dev/xvda -o "$device" = /dev/xvda1 ]; then continue; fi
           fsType=$(blkid -o value -s TYPE "$device" || true)
           if [ "$fsType" = swap ]; then