[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/1.2.7-1-15-g01d11bb

[Iustin Pop]

The following commit has been merged in the master branch:
commit 01d11bb8749e6d0241d0471a10fe11d284eeba18
Author: Iustin Pop <iustin at google.com>
Date:   Sat Jul 25 12:27:55 2009 +0200

    Close bug 528618

diff --git a/debian/changelog b/debian/changelog
index e0496d7..11edba3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ ganeti (2.0.2-1) unstable; urgency=low
     is not automatic (and needs cluster shutdown)
   * Remove Leonardo (l at lmello.eu.org) from the Uploaders list, since he
     wasn't active in a long while
+  * Fix "ganeti (HVM mode) default expected kernel:
+    /usr/lib/xen/boot/hvmloader in lenny not exist" (Closes: #528618);
+    note that this is a fix that works for unstable, not Lenny
 
- -- Iustin Pop <iusty at k1024.org>  Sat, 25 Jul 2009 11:55:52 +0200
+ -- Iustin Pop <iusty at k1024.org>  Sat, 25 Jul 2009 12:25:03 +0200
 
 ganeti (1.2.7-1) unstable; urgency=low
 
diff --git a/debian/patches/fix-hvmloader-path.patch b/debian/patches/fix-hvmloader-path.patch
new file mode 100644
index 0000000..003270f
--- /dev/null
+++ b/debian/patches/fix-hvmloader-path.patch
@@ -0,0 +1,20 @@
+Fix bug #528618
+
+This modifies ganeti's hardcoded Xen hvmloader patch (which is fixed in
+upstream via a configure-time option in the 2.1 series).
+
+This will need adjusting with each change in the Xen packaging
+(xen-utils-…).
+
+Iustin Pop <iusty at k1024.org> Sat, 25 Jul 2009 12:21:46 +0200
+--- a/lib/hypervisor/hv_xen.py
++++ b/lib/hypervisor/hv_xen.py
+@@ -589,7 +589,7 @@
+ 
+     config = StringIO()
+     config.write("# this is autogenerated by Ganeti, please do not edit\n#\n")
+-    config.write("kernel = '/usr/lib/xen/boot/hvmloader'\n")
++    config.write("kernel = '/usr/lib/xen-unstable/boot/hvmloader'\n")
+     config.write("builder = 'hvm'\n")
+     config.write("memory = %d\n" % instance.beparams[constants.BE_MEMORY])
+     config.write("vcpus = %d\n" % instance.beparams[constants.BE_VCPUS])
diff --git a/debian/patches/series b/debian/patches/series
index 2465d9c..5625f55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-startup-with-old-config.patch
+fix-hvmloader-path.patch

-- 
Ganeti packaging