From: Guido Trotter <ultrotter@google.com>
Date: Wed, 22 Oct 2008 14:09:42 +0000 (+0000)
Subject: instance debootstrap: enable import
X-Git-Tag: v0.6~6
X-Git-Url: http://git.equinoxoli.org/?p=ext%2Finstance-debootstrap.git;a=commitdiff_plain;h=9162e835e2b2a6e954b99d87586345adcbce563f

instance debootstrap: enable import

Reviewed-by: iustinp
---

diff --git a/common.sh b/common.sh
index 6241937..941e425 100644
--- a/common.sh
+++ b/common.sh
@@ -66,6 +66,11 @@ get_api10_arguments() {
       log_error "Missing OS API Variable EXPORT_DEVICE"
     fi
     blockdev=$EXPORT_DEVICE
+  elif [ "$SCRIPT_NAME" = "import" ]; then
+    if [ -z "$IMPORT_DEVICE" ]; then
+       log_error "Missing OS API Variable IMPORT_DEVICE"
+    fi
+    blockdev=$IMPORT_DEVICE
   else
     blockdev=$DISK_0_PATH
   fi
@@ -80,10 +85,6 @@ if [ -z "$OS_API_VERSION" -o "$OS_API_VERSION" = "5" ]; then
   get_api5_arguments
 elif [ "$OS_API_VERSION" = "10" ]; then
   get_api10_arguments
-  if [ $SCRIPT_NAME = "import" ]; then
-    log_error "import still not compatible with API version 10"
-    exit 1
-  fi
 else
   log_error "Unknown OS API VERSION $OS_API_VERSION"
   exit 1