[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, master, updated. debian/0.500.6-1-7-g04564c3

[Laurent Léonard]

The following commit has been merged in the master branch:
commit cb83165e270ba6d1c2a982fd649fe04256835984
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Sat Jul 30 20:32:16 2011 +0200

    Update patch 0001-fix-path-to-hvmloader.patch

diff --git a/debian/patches/0001-fix-path-to-hvmloader.patch b/debian/patches/0001-fix-path-to-hvmloader.patch
index 1c24293..b20a1d4 100644
--- a/debian/patches/0001-fix-path-to-hvmloader.patch
+++ b/debian/patches/0001-fix-path-to-hvmloader.patch
@@ -8,16 +8,16 @@ Closes: #487682
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/virtinst/Installer.py b/virtinst/Installer.py
-index a0373ea..e77e54d 100644
+index a0316d2..795db43 100644
 --- a/virtinst/Installer.py
 +++ b/virtinst/Installer.py
-@@ -286,7 +286,7 @@ class Installer(XMLBuilderDomain.XMLBuilderDomain):
-         arch = self.arch
-         loader = self.loader
-         if not loader and ishvm and self.type == "xen":
+@@ -325,7 +325,7 @@ class Installer(XMLBuilderDomain.XMLBuilderDomain):
+         hvxen = (hvtype == "xen")
+ 
+         if not loader and self.is_hvm() and hvxen:
 -            loader = "/usr/lib/xen/boot/hvmloader"
 +            loader = "/usr/lib/xen-default/boot/hvmloader"
  
-         if not isinstall and not ishvm and not self.bootconfig.kernel:
-             return "<bootloader>%s</bootloader>" % _util.pygrub_path(conn)
+         # Use older libvirt 'linux' value for back compat
+         if os_type == "xen" and hvxen:
 -- 
diff --git a/debian/patches/0002-Fix-path-to-pygrub.patch b/debian/patches/0002-Fix-path-to-pygrub.patch
index 921a530..1a7a0c8 100644
--- a/debian/patches/0002-Fix-path-to-pygrub.patch
+++ b/debian/patches/0002-Fix-path-to-pygrub.patch
@@ -7,7 +7,7 @@ Subject: Fix path to pygrub
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/virtinst/util.py b/virtinst/util.py
-index e259fdb..bb2b703 100644
+index e120d8e..b59c585 100644
 --- a/virtinst/util.py
 +++ b/virtinst/util.py
 @@ -386,11 +386,11 @@ def pygrub_path(conn=None):
diff --git a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
index 20f05eb..d8369dc 100644
--- a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
+++ b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
@@ -8,7 +8,7 @@ Since console-setup 1.47 the keyboard configuration is in a new package keyboard
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/virtinst/util.py b/virtinst/util.py
-index bb2b703..a072c05 100644
+index b59c585..a4af1b8 100644
 --- a/virtinst/util.py
 +++ b/virtinst/util.py
 @@ -44,7 +44,7 @@ import support

-- 
Virtinst Debian packaging