[Pkg-libvirt-commits] [virt-manager] 04/07: Update virtinst patches

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1%0.10.0-1
in repository virt-manager.

commit e649c0a477c650704d0385306b8e97c7f5d4e66f
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Jan 11 14:10:02 2014 +0100

    Update virtinst patches
    
    Dropped, fixed upstream:
        0003-Fix-path-to-keyboard-configuration.patch
        0004-Fix-location-of-Debian-daily-builds.patch
        0005-Don-t-fail-if-we-can-t-set-locale-debian-bug-697864.patch
        0006-virt-clone-Properly-set-image-type.patch
---
 debian/patches/series                              |  2 ++
 debian/patches/virtinst/Fix-patch-to-pygrub.patch  | 27 ++++++++++++++++++++++
 .../patches/virtinst/fix-path-to-hvmloader.patch   | 22 ++++++++++++++++++
 3 files changed, 51 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f4f4f00
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+virtinst/fix-path-to-hvmloader.patch
+virtinst/Fix-patch-to-pygrub.patch
diff --git a/debian/patches/virtinst/Fix-patch-to-pygrub.patch b/debian/patches/virtinst/Fix-patch-to-pygrub.patch
new file mode 100644
index 0000000..9043cbb
--- /dev/null
+++ b/debian/patches/virtinst/Fix-patch-to-pygrub.patch
@@ -0,0 +1,27 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sat, 11 Jan 2014 14:05:29 +0100
+Subject: Fix patch to pygrub
+
+Closes: #685749
+---
+ virtinst/Installer.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/virtinst/Installer.py b/virtinst/Installer.py
+index d7ffaff..463b9d9 100644
+--- a/virtinst/Installer.py
++++ b/virtinst/Installer.py
+@@ -43,11 +43,11 @@ def _pygrub_path(conn=None):
+         if (cap.host.arch == "i86pc"):
+             return "/usr/lib/xen/bin/pygrub"
+         else:
+-            return "/usr/bin/pygrub"
++            return "pygrub"
+ 
+     if platform.system() == "SunOS":
+         return "/usr/lib/xen/bin/pygrub"
+-    return "/usr/bin/pygrub"
++    return "pygrub"
+ 
+ 
+ class Installer(XMLBuilderDomain.XMLBuilderDomain):
diff --git a/debian/patches/virtinst/fix-path-to-hvmloader.patch b/debian/patches/virtinst/fix-path-to-hvmloader.patch
new file mode 100644
index 0000000..a1ba01e
--- /dev/null
+++ b/debian/patches/virtinst/fix-path-to-hvmloader.patch
@@ -0,0 +1,22 @@
+From: Oliver Seufer <debian at seufer.de>
+Date: Sat, 1 Jun 2013 22:41:07 +0200
+Subject: fix path to hvmloader
+
+Closes: #685749
+---
+ virtinst/Installer.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/virtinst/Installer.py b/virtinst/Installer.py
+index eea7c17..d7ffaff 100644
+--- a/virtinst/Installer.py
++++ b/virtinst/Installer.py
+@@ -306,7 +306,7 @@ class Installer(XMLBuilderDomain.XMLBuilderDomain):
+         hvxen = (hvtype == "xen")
+ 
+         if not loader and self.is_hvm() and hvxen:
+-            loader = "/usr/lib/xen/boot/hvmloader"
++            loader = "hvmloader"
+ 
+         # Use older libvirt 'linux' value for back compat
+         if os_type == "xen" and hvxen:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/virt-manager.git