[Pkg-libvirt-commits] [SCM] Virt Installer packaging branch, master, updated. debian/0.400.1-1-8-g88581dc

[Guido Günther]

The following commit has been merged in the master branch:
commit f95ac5c0e8673b31a858b61ae1d01481079f541d
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Mar 22 19:45:39 2009 +0100

    rediff remaining patches against new upstream version

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 bce0a84..c57c66c 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
@@ -9,12 +9,12 @@ Closes: #455860
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/virt-install b/virt-install
-index 5529a9d..cff4b2c 100755
+index ac4da5b..f163957 100755
 --- a/virt-install
 +++ b/virt-install
-@@ -554,7 +554,7 @@ def main():
+@@ -589,7 +589,7 @@ def main():
+         ishvm = False
  
-     # now let's get some of the common questions out of the way
      cli.get_name(options.name, guest)
 -    cli.get_memory(options.memory, guest)
 +    cli.get_memory(options.memory, guest, options.os_variant)
@@ -22,10 +22,10 @@ index 5529a9d..cff4b2c 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 9da4f6e..4b6d564 100644
+index 12ab73b..9aeaeb6 100644
 --- a/virtinst/cli.py
 +++ b/virtinst/cli.py
-@@ -191,11 +191,15 @@ def get_name(name, guest):
+@@ -192,11 +192,15 @@ def get_name(name, guest):
      except ValueError, e:
          fail(e)
  
diff --git a/debian/patches/0002-fix-path-to-hvmloader.patch b/debian/patches/0002-fix-path-to-hvmloader.patch
index e109f7f..0ef2bbc 100644
--- a/debian/patches/0002-fix-path-to-hvmloader.patch
+++ b/debian/patches/0002-fix-path-to-hvmloader.patch
@@ -8,10 +8,10 @@ Closes: #487682
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/virtinst/FullVirtGuest.py b/virtinst/FullVirtGuest.py
-index 532cce9..2b6f9e2 100644
+index 8dc2b0a..0912b0d 100644
 --- a/virtinst/FullVirtGuest.py
 +++ b/virtinst/FullVirtGuest.py
-@@ -64,7 +64,7 @@ class FullVirtGuest(Guest):
+@@ -60,7 +60,7 @@ class FullVirtGuest(Guest):
                      self.emulator = "/usr/lib/xen/bin/qemu-dm"
  
          if (not self.loader) and self.type == "xen":
diff --git a/debian/patches/0003-Fix-path-to-pygrub.patch b/debian/patches/0003-Fix-path-to-pygrub.patch
index 6276003..57a3212 100644
--- a/debian/patches/0003-Fix-path-to-pygrub.patch
+++ b/debian/patches/0003-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 24a6ba6..a9bd452 100644
+index a0cdd0c..17dcc14 100644
 --- a/virtinst/util.py
 +++ b/virtinst/util.py
-@@ -403,11 +403,11 @@ def pygrub_path(conn=None):
+@@ -431,11 +431,11 @@ def pygrub_path(conn=None):
          if (cap.host.arch == "i86pc"):
              return "/usr/lib/xen/bin/pygrub"
          else:

-- 
Virt Installer packaging