From: Axel Beckert <abe@deuxchevaux.org>
Date: Thu, 7 Jun 2012 12:48:47 +0000 (+0200)
Subject: Support rinse 2.0
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5d1b6e0c1392b2d78c774579064cc3439f2c4206;p=people%2Fdariof%2Fxen-tools.git

Support rinse 2.0

With rinse 2.0 the --arch option in mandatory. Let it default to the
Dom0's architecture.
---

diff --git a/bin/xt-install-image b/bin/xt-install-image
index 2582bc5..078381f 100755
--- a/bin/xt-install-image
+++ b/bin/xt-install-image
@@ -821,7 +821,24 @@ sub do_rinse
     {
         $command .= " --arch $CONFIG{'arch'}";
     }
+    else
+    {
+        my $uname_machine = `uname -m`;
+        chomp($uname_machine);
 
+        if ($uname_machine eq 'x86_64')
+        {
+            $command .= " --arch amd64";
+        }
+        elsif ($uname_machine =~ /^i[3-6]86$/) {
+            $command .= " --arch i386";
+        }
+        else
+        {
+            die "Local architecture ($uname_machine) not supported by rinse.\n".
+                "Please choose a supported installation architecture (i386 or amd64) explicitly."
+        }
+    }
 
     #
     #  Propogate the verbosity setting.
diff --git a/debian/changelog b/debian/changelog
index 74d71b5..a051d8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xen-tools (4.3~dev-1) UNRELEASED; urgency=low
     - Supports creating Ubuntu 12.04 Precise and 12.10 Quantal DomUs
     - Supports creating CentOS 6 DomUs (Thanks Johan Schurer)
       + Recommend rinse >= 1.9.1-1
+    - Supports rinse 2.0
     - Updated mirror list for discontinued releases of Debian and Ubuntu
     - Workaround for missing unit parsing in xen-create-nfs (Closes:
       #648814)