[libguestfs] Upstream patch to fix timer check failures during boot (RHBZ#502058).
Richard W.M. Jones
rjones at fedoraproject.org
Mon Sep 26 12:38:13 UTC 2011
commit c723eb18c8e0a13aa298c2b89ddc7774b79b3cda
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Mon Sep 26 13:37:47 2011 +0100
Upstream patch to fix timer check failures during boot (RHBZ#502058).
...r_check-to-disable-faulty-test-during-boo.patch | 31 ++++++++++++++++++++
libguestfs.spec | 9 +++++-
2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/0001-Add-no_timer_check-to-disable-faulty-test-during-boo.patch b/0001-Add-no_timer_check-to-disable-faulty-test-during-boo.patch
new file mode 100644
index 0000000..5c3b178
--- /dev/null
+++ b/0001-Add-no_timer_check-to-disable-faulty-test-during-boo.patch
@@ -0,0 +1,31 @@
+From 322106521f546d7c70c5a38255db7d243a456a6b Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Mon, 26 Sep 2011 13:34:12 +0100
+Subject: [PATCH] Add no_timer_check to disable faulty test during boot
+ (RHBZ#502058).
+
+See:
+
+https://bugzilla.redhat.com/show_bug.cgi?id=502058#c15
+https://bugzilla.redhat.com/show_bug.cgi?id=698842#c8
+
+This updates commit 79e66f89e2f6c27486476d7857da58feb491bf5c.
+---
+ src/launch.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/launch.c b/src/launch.c
+index 515ccd5..80eadef 100644
+--- a/src/launch.c
++++ b/src/launch.c
+@@ -606,6 +606,7 @@ launch_appliance (guestfs_h *g)
+ "panic=1 " /* force kernel to panic if daemon exits */ \
+ "console=ttyS0 " /* serial console */ \
+ "udevtimeout=300 " /* good for very slow systems (RHBZ#480319) */ \
++ "no_timer_check " /* fix for RHBZ#502058 */ \
+ "acpi=off " /* we don't need ACPI, turn it off */ \
+ "printk.time=1 " /* display timestamp before kernel messages */ \
+ "cgroup_disable=memory " /* saves us about 5 MB of RAM */
+--
+1.7.6
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 91dce42..30e8f86 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.13.14
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@@ -49,6 +49,9 @@ Patch2: libguestfs-1.12.0-configure-force-machine-accel-tcg.patch
# while.
Patch3: 0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
+# Upstream patch to fix timer check failures during boot.
+Patch4: 0001-Add-no_timer_check-to-disable-faulty-test-during-boo.patch
+
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text
@@ -518,6 +521,7 @@ for %{name}.
%patch0 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
mkdir -p daemon/m4
@@ -897,6 +901,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Sep 26 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.13.14-2
+- Upstream patch to fix timer check failures during boot (RHBZ#502058).
+
* Sat Sep 24 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.13.14-1
- New upstream version 1.13.14.
More information about the scm-commits
mailing list