[Pkg-libvirt-commits] [SCM] Virt Installer packaging branch, master, updated. debian/0.400.0-7-5-g7170775

[Guido Günther]

The following commit has been merged in the master branch:
commit dc1ae07212300c4fd9bbd8276ed96f634eb34fee
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Jan 29 16:40:04 2009 +0100

    rebase debian specific patches

diff --git a/debian/patches/0001-Don-t-require-256MB-on-Debian-installations.patch b/debian/patches/0001-Don-t-require-256MB-on-Debian-installations.patch
index b498175..bce0a84 100644
--- a/debian/patches/0001-Don-t-require-256MB-on-Debian-installations.patch
+++ b/debian/patches/0001-Don-t-require-256MB-on-Debian-installations.patch
@@ -1,4 +1,3 @@
-From 2d6aea8f570a2b0e0ca294385a131ed03c7bdc03 Mon Sep 17 00:00:00 2001
 From: Guido Guenther <agx at sigxcpu.org>
 Date: Tue, 24 Jun 2008 15:26:29 +0200
 Subject: [PATCH] Don't require 256MB on Debian installations
@@ -10,10 +9,10 @@ Closes: #455860
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/virt-install b/virt-install
-index 78679c6..10d60ce 100755
+index 5529a9d..cff4b2c 100755
 --- a/virt-install
 +++ b/virt-install
-@@ -559,7 +559,7 @@ def main():
+@@ -554,7 +554,7 @@ def main():
  
      # now let's get some of the common questions out of the way
      cli.get_name(options.name, guest)
@@ -23,10 +22,10 @@ index 78679c6..10d60ce 100755
      cli.get_vcpus(options.vcpus, options.check_cpu, guest, conn)
      cli.get_cpuset(options.cpuset, guest.memory, guest, conn)
 diff --git a/virtinst/cli.py b/virtinst/cli.py
-index db9ef9a..3e9a3c6 100644
+index 9da4f6e..4b6d564 100644
 --- a/virtinst/cli.py
 +++ b/virtinst/cli.py
-@@ -188,11 +188,15 @@ def get_name(name, guest):
+@@ -191,11 +191,15 @@ def get_name(name, guest):
      except ValueError, e:
          fail(e)
  
@@ -46,5 +45,3 @@ index db9ef9a..3e9a3c6 100644
          guest.memory = memory
      except ValueError, e:
 -- 
-1.5.6.5
-
diff --git a/debian/patches/0002-fix-path-to-hvmloader.patch b/debian/patches/0002-fix-path-to-hvmloader.patch
index 16ef119..e109f7f 100644
--- a/debian/patches/0002-fix-path-to-hvmloader.patch
+++ b/debian/patches/0002-fix-path-to-hvmloader.patch
@@ -1,4 +1,3 @@
-From 7f79ab9db72b6ab74185de9de518a05a3230029a Mon Sep 17 00:00:00 2001
 From: Guido Guenther <agx at sigxcpu.org>
 Date: Tue, 24 Jun 2008 15:24:21 +0200
 Subject: [PATCH] fix path to hvmloader
@@ -9,18 +8,16 @@ Closes: #487682
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/virtinst/FullVirtGuest.py b/virtinst/FullVirtGuest.py
-index 2a83ee1..7fe4d94 100644
+index 532cce9..2b6f9e2 100644
 --- a/virtinst/FullVirtGuest.py
 +++ b/virtinst/FullVirtGuest.py
-@@ -193,7 +193,7 @@ class FullVirtGuest(Guest.XenGuest):
+@@ -64,7 +64,7 @@ class FullVirtGuest(Guest):
                      self.emulator = "/usr/lib/xen/bin/qemu-dm"
  
          if (not self.loader) and self.type == "xen":
 -            self.loader = "/usr/lib/xen/boot/hvmloader"
 +            self.loader = "/usr/lib/xen-default/boot/hvmloader"
  
-         self._os_type = None
-         self._os_variant = None
+ 
+     def os_features(self):
 -- 
-1.5.6.5
-
diff --git a/debian/patches/0003-Fix-path-to-pygrub.patch b/debian/patches/0003-Fix-path-to-pygrub.patch
index 6d82d9d..6276003 100644
--- a/debian/patches/0003-Fix-path-to-pygrub.patch
+++ b/debian/patches/0003-Fix-path-to-pygrub.patch
@@ -1,4 +1,3 @@
-From ef35fba6586340bd9610d2d22a55f1eb4ddd7bce Mon Sep 17 00:00:00 2001
 From: Marco Sinhoreli <msinhore at gmail.com>
 Date: Thu, 26 Jun 2008 18:07:13 +0200
 Subject: [PATCH] Fix path to pygrub
@@ -8,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 1e1c84d..e7742db 100644
+index 24a6ba6..a9bd452 100644
 --- a/virtinst/util.py
 +++ b/virtinst/util.py
-@@ -310,11 +310,11 @@ def pygrub_path(conn=None):
+@@ -403,11 +403,11 @@ def pygrub_path(conn=None):
          if (cap.host.arch == "i86pc"):
              return "/usr/lib/xen/bin/pygrub"
          else:
@@ -26,5 +25,3 @@ index 1e1c84d..e7742db 100644
  def uri_split(uri):
      """
 -- 
-1.5.6.5
-

-- 
Virt Installer packaging