From 280c138a9133d25965a302596a37a7a3c5b565b7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 7 Jan 2010 14:12:22 +0000 Subject: [PATCH] - Remove gfs-utils (deprecated and removed from Fedora 13 by the upstream Cluster Suite developers). - Include patch to fix regression in qemu -serial stdio option. --- ...am-regression-of-stdio-serial-option.patch | 59 +++++++++++++++++++ libguestfs.spec | 15 ++++- 2 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 libguestfs-1.0.80-qemu-Upstream-regression-of-stdio-serial-option.patch diff --git a/libguestfs-1.0.80-qemu-Upstream-regression-of-stdio-serial-option.patch b/libguestfs-1.0.80-qemu-Upstream-regression-of-stdio-serial-option.patch new file mode 100644 index 0000000..c60c65d --- /dev/null +++ b/libguestfs-1.0.80-qemu-Upstream-regression-of-stdio-serial-option.patch @@ -0,0 +1,59 @@ +From b4a4db522fed542f48aa60717e65061c5e83c919 Mon Sep 17 00:00:00 2001 +From: Richard Jones +Date: Thu, 7 Jan 2010 12:21:42 +0000 +Subject: [PATCH] qemu: Upstream regression of -stdio serial option. + +Best explained by the comment in the code: + + /* Newer versions of qemu (from around 2009/12) changed the + * behaviour of monitors so that an implicit '-monitor stdio' is + * assumed if we are in -nographic mode and there is no other + * -monitor option. Only a single stdio device is allowed, so + * this broke the '-serial stdio' option. There is a new flag + * called -nodefaults which gets rid of all this default crud, so + * let's use that to avoid this and any future surprises. + */ +--- + src/guestfs.c | 21 +++++++++++++++++---- + 1 files changed, 17 insertions(+), 4 deletions(-) + +diff --git a/src/guestfs.c b/src/guestfs.c +index 7cc09ce..a3d2762 100644 +--- a/src/guestfs.c ++++ b/src/guestfs.c +@@ -1091,15 +1091,28 @@ guestfs__launch (guestfs_h *g) + */ + g->cmdline[0] = g->qemu; + +- snprintf (buf, sizeof buf, "%d", g->memsize); +- add_cmdline (g, "-m"); +- add_cmdline (g, buf); ++ /* Newer versions of qemu (from around 2009/12) changed the ++ * behaviour of monitors so that an implicit '-monitor stdio' is ++ * assumed if we are in -nographic mode and there is no other ++ * -monitor option. Only a single stdio device is allowed, so ++ * this broke the '-serial stdio' option. There is a new flag ++ * called -nodefaults which gets rid of all this default crud, so ++ * let's use that to avoid this and any future surprises. ++ */ ++ if (qemu_supports (g, "-nodefaults")) ++ add_cmdline (g, "-nodefaults"); + +- add_cmdline (g, "-no-reboot"); /* Force exit instead of reboot on panic */ + add_cmdline (g, "-nographic"); + add_cmdline (g, "-serial"); + add_cmdline (g, "stdio"); + ++ snprintf (buf, sizeof buf, "%d", g->memsize); ++ add_cmdline (g, "-m"); ++ add_cmdline (g, buf); ++ ++ /* Force exit instead of reboot on panic */ ++ add_cmdline (g, "-no-reboot"); ++ + /* These options recommended by KVM developers to improve reliability. */ + if (qemu_supports (g, "-no-hpet")) + add_cmdline (g, "-no-hpet"); +-- +1.6.5.2 + diff --git a/libguestfs.spec b/libguestfs.spec index 33fe0af..594cac1 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -5,7 +5,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.0.80 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -18,6 +18,9 @@ Patch0: libguestfs-1.0.79-no-fuse-test.patch # Work around udevsettle command broken in Fedora 13 (RHBZ#548121). Patch1: libguestfs-1.0.80-daemon-Work-around-udevsettle-issue-RHBZ-548121.patch +# Fix regression in qemu -serial stdio option. +Patch2: libguestfs-1.0.80-qemu-Upstream-regression-of-stdio-serial-option.patch + # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text @@ -41,7 +44,7 @@ BuildRequires: kernel, bash, coreutils, lvm2, ntfs-3g, util-linux-ng BuildRequires: MAKEDEV, net-tools, augeas-libs, file BuildRequires: module-init-tools, procps, strace, iputils BuildRequires: dosfstools, zerofree, lsof, scrub, libselinux -BuildRequires: parted, btrfs-progs, gfs-utils, gfs2-utils +BuildRequires: parted, btrfs-progs, gfs2-utils BuildRequires: hfsplus-tools, nilfs-utils, reiserfs-utils BuildRequires: jfsutils, xfsprogs %ifarch %{ix86} x86_64 @@ -53,7 +56,7 @@ Requires: kernel, bash, coreutils, lvm2, ntfs-3g, util-linux-ng Requires: MAKEDEV, net-tools, augeas-libs, file Requires: module-init-tools, procps, strace, iputils Requires: dosfstools, zerofree, lsof, scrub, libselinux -Requires: parted, btrfs-progs, gfs-utils, gfs2-utils +Requires: parted, btrfs-progs, gfs2-utils Requires: hfsplus-tools, nilfs-utils, reiserfs-utils Requires: jfsutils, xfsprogs %ifarch %{ix86} x86_64 @@ -338,6 +341,7 @@ Requires: jpackage-utils %patch0 -p1 %patch1 -p1 +%patch2 -p1 mkdir -p daemon/m4 @@ -612,6 +616,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 7 2010 Richard W.M. Jones - 1.0.80-11 +- Remove gfs-utils (deprecated and removed from Fedora 13 by the + upstream Cluster Suite developers). +- Include patch to fix regression in qemu -serial stdio option. + * Tue Dec 29 2009 Richard W.M. Jones - 1.0.80-10 - Remove some debugging statements which were left in the requires script by accident.