[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.5.1-1-2-g4f44aa0

[Iustin Pop]

The following commit has been merged in the master branch:
commit 4f44aa05fb5bea76324b4bcac09ea2b5b0c36be2
Author: Iustin Pop <iustin at debian.org>
Date:   Thu Jul 26 20:23:13 2012 +0200

    Add patch fixing obsolete -disable-kvm usage
    
    Signed-off-by: Iustin Pop <iustin at debian.org>

diff --git a/debian/patches/fix-no-kvm.patch b/debian/patches/fix-no-kvm.patch
new file mode 100644
index 0000000..1768e68
--- /dev/null
+++ b/debian/patches/fix-no-kvm.patch
@@ -0,0 +1,17 @@
+Author: Iustin Pop <iustin at debian.org>
+Description: Fix obsolete -disable-kvm usage
+ This is already a bug upstream, but pending proper fixing (per version keying,
+ etc.), let's just use the correct version that will be shipped in Wheezy.
+Bug: https://code.google.com/p/ganeti/issues/detail?id=250
+Last-Update: 2012-07-26
+--- a/lib/hypervisor/hv_kvm.py
++++ b/lib/hypervisor/hv_kvm.py
+@@ -554,7 +554,7 @@
+     if hvp[constants.HV_KVM_FLAG] == constants.HT_KVM_ENABLED:
+       kvm_cmd.extend(["-enable-kvm"])
+     elif hvp[constants.HV_KVM_FLAG] == constants.HT_KVM_DISABLED:
+-      kvm_cmd.extend(["-disable-kvm"])
++      kvm_cmd.extend(["-no-kvm"])
+ 
+     if boot_network:
+       kvm_cmd.extend(["-boot", "n"])
diff --git a/debian/patches/series b/debian/patches/series
index ff54fa6..f02b48b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 fix-old-style-imports.patch
+fix-no-kvm.patch

-- 
Ganeti packaging