[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, experimental, updated. debian/0.500.3-2-10-g549405f

[Laurent Léonard]

The following commit has been merged in the experimental branch:
commit e4d1f6d7ab5ba440e3376eecff448207f4a52acd
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Sat Jan 29 21:40:50 2011 +0100

    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 494e971..00c5e5c 100644
--- a/debian/patches/0001-fix-path-to-hvmloader.patch
+++ b/debian/patches/0001-fix-path-to-hvmloader.patch
@@ -4,20 +4,20 @@ Subject: [PATCH] fix path to hvmloader
 
 Closes: #487682
 ---
- virtinst/FullVirtGuest.py |    2 +-
+ virtinst/Installer.py |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/virtinst/FullVirtGuest.py b/virtinst/FullVirtGuest.py
-index 6adeee0..28fbbe6 100644
---- a/virtinst/FullVirtGuest.py
-+++ b/virtinst/FullVirtGuest.py
-@@ -65,7 +65,7 @@ class FullVirtGuest(Guest):
-                     self.emulator = "/usr/lib/xen/bin/qemu-dm"
+diff --git a/virtinst/Installer.py b/virtinst/Installer.py
+index a0373ea..e77e54d 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":
+-            loader = "/usr/lib/xen/boot/hvmloader"
++            loader = "/usr/lib/xen-default/boot/hvmloader"
  
-         if (not self.loader) and self.type == "xen":
--            self.loader = "/usr/lib/xen/boot/hvmloader"
-+            self.loader = "/usr/lib/xen-default/boot/hvmloader"
- 
-     def _get_default_console_device(self):
-         dev = VirtualCharDevice.get_dev_instance(self.conn,
+         if not isinstall and not ishvm and not self.bootconfig.kernel:
+             return "<bootloader>%s</bootloader>" % _util.pygrub_path(conn)
 -- 
diff --git a/debian/patches/0002-Fix-path-to-pygrub.patch b/debian/patches/0002-Fix-path-to-pygrub.patch
index 41897f1..1c89dd1 100644
--- a/debian/patches/0002-Fix-path-to-pygrub.patch
+++ b/debian/patches/0002-Fix-path-to-pygrub.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Fix path to pygrub
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/virtinst/util.py b/virtinst/util.py
-index 92dacfe..dcb4ee8 100644
+index 083633f..77562e5 100644
 --- a/virtinst/util.py
 +++ b/virtinst/util.py
-@@ -402,11 +402,11 @@ def pygrub_path(conn=None):
+@@ -386,11 +386,11 @@ def pygrub_path(conn=None):
          if (cap.host.arch == "i86pc"):
              return "/usr/lib/xen/bin/pygrub"
          else:
diff --git a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
index decfea2..396bd9b 100644
--- a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
+++ b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
@@ -8,16 +8,16 @@ 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 dcb4ee8..773c5d5 100644
+index 77562e5..8110a6c 100644
 --- a/virtinst/util.py
 +++ b/virtinst/util.py
-@@ -45,7 +45,7 @@ import support
+@@ -44,7 +44,7 @@ import support
  
  KEYBOARD_DIR = "/etc/sysconfig/keyboard"
  XORG_CONF = "/etc/X11/xorg.conf"
 -CONSOLE_SETUP_CONF = "/etc/default/console-setup"
 +CONSOLE_SETUP_CONF = "/etc/default/keyboard"
  
- def default_route(nic = None):
+ def default_route(nic=None):
      if platform.system() == 'SunOS':
 -- 

-- 
Virtinst Debian packaging