[Pkg-libvirt-commits] [virt-manager] 03/05: Update patches

[Guido Guenther]

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

agx pushed a commit to branch experimental
in repository virt-manager.

commit a675fa67b4a6da3d5c8d0dbf42abc853d77993a5
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Feb 5 21:47:52 2014 +0100

    Update patches
---
 debian/patches/virtinst/Fix-patch-to-pygrub.patch  | 33 +++++++++-------------
 .../patches/virtinst/fix-path-to-hvmloader.patch   | 26 ++++++++---------
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/debian/patches/virtinst/Fix-patch-to-pygrub.patch b/debian/patches/virtinst/Fix-patch-to-pygrub.patch
index 9043cbb..3e44793 100644
--- a/debian/patches/virtinst/Fix-patch-to-pygrub.patch
+++ b/debian/patches/virtinst/Fix-patch-to-pygrub.patch
@@ -4,24 +4,19 @@ Subject: Fix patch to pygrub
 
 Closes: #685749
 ---
- virtinst/Installer.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ virtinst/guest.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-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"
+diff --git a/virtinst/guest.py b/virtinst/guest.py
+index eaa7ffa..a0ad3be 100644
+--- a/virtinst/guest.py
++++ b/virtinst/guest.py
+@@ -337,7 +337,7 @@ class Guest(XMLBuilder):
+         if (not install and
+             self.os.is_xenpv() and
+             not self.os.kernel):
+-            self.bootloader = "/usr/bin/pygrub"
++            self.bootloader = "pygrub"
+             self.os.clear()
  
-     if platform.system() == "SunOS":
-         return "/usr/lib/xen/bin/pygrub"
--    return "/usr/bin/pygrub"
-+    return "pygrub"
- 
- 
- class Installer(XMLBuilderDomain.XMLBuilderDomain):
+         return self.get_xml_config()
diff --git a/debian/patches/virtinst/fix-path-to-hvmloader.patch b/debian/patches/virtinst/fix-path-to-hvmloader.patch
index a1ba01e..f22217f 100644
--- a/debian/patches/virtinst/fix-path-to-hvmloader.patch
+++ b/debian/patches/virtinst/fix-path-to-hvmloader.patch
@@ -4,19 +4,19 @@ Subject: fix path to hvmloader
 
 Closes: #685749
 ---
- virtinst/Installer.py | 2 +-
+ virtinst/guest.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")
+diff --git a/virtinst/guest.py b/virtinst/guest.py
+index f713035..eaa7ffa 100644
+--- a/virtinst/guest.py
++++ b/virtinst/guest.py
+@@ -628,7 +628,7 @@ class Guest(XMLBuilder):
+             self.os.init = self.os.init or "/bin/sh"
  
-         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:
+         if not self.os.loader and self.os.is_hvm() and self.type == "xen":
+-            self.os.loader = "/usr/lib/xen/boot/hvmloader"
++            self.os.loader = "hvmloader"
+         if self.os.os_type == "xen" and self.type == "xen":
+             # Use older libvirt 'linux' value for back compat
+             self.os.os_type = "linux"

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