[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.16.18-1-89-g6038ece

[Hilko Bengen]

The following commit has been merged in the master branch:
commit e39f17cab6e056c7dab7efeb1a030f061a2a539f
Author: Hilko Bengen <bengen at debian.org>
Date:   Tue Aug 14 21:44:09 2012 +0200

    Added patch that reverts upstream sgabios change
    
    sgabios is not (yet?) available with qemu-kvm.

diff --git a/debian/patches/0008-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch b/debian/patches/0008-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
new file mode 100644
index 0000000..ef5e582
--- /dev/null
+++ b/debian/patches/0008-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
@@ -0,0 +1,29 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Tue, 14 Aug 2012 21:42:08 +0200
+Subject: Revert "qemu: Use sgabios by default (thanks Dan Berrange)."
+
+This reverts commit 82e3b7509dea41823c1ce58acd61d406d460c0ab.
+---
+ src/launch.c |    9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/src/launch.c b/src/launch.c
+index cb51526..b0c810e 100644
+--- a/src/launch.c
++++ b/src/launch.c
+@@ -777,15 +777,6 @@ launch_appliance (guestfs_h *g)
+     add_cmdline (g, "stdio");
+ #endif
+ 
+-    /* Use sgabios instead of vgabios.  This means we'll see BIOS
+-     * messages on the serial port, and also works around this bug
+-     * in qemu 1.1.0:
+-     * https://bugs.launchpad.net/qemu/+bug/1021649
+-     * QEmu has included sgabios upstream since just before 1.0.
+-     */
+-    add_cmdline (g, "-device");
+-    add_cmdline (g, "sga");
+-
+     /* Set up virtio-serial for the communications channel. */
+     add_cmdline (g, "-chardev");
+     snprintf (buf, sizeof buf, "socket,path=%s,id=channel0", guestfsd_sock);
diff --git a/debian/patches/series b/debian/patches/series
index 504bfd8..6394e47 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-out-of-tree-build-daemon.patch
 0006-ruby-install-to-vendor_ruby.patch
 0007-Fix-guestfs-supermin-appliance-path.patch
+0008-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch

-- 
Libguestfs Debian packaging