From 74e59b750edc5d9db4037988bff197b9074b2b26 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Feb 01 2011 12:30:59 +0000
Subject: - Enable trace in 'make check' section.

- Add hack to track down problem in is_root_mounted (only affects Koji).

---

diff --git a/0001-hack-print-etc-mtab-in-is_root_mounted-test.patch b/0001-hack-print-etc-mtab-in-is_root_mounted-test.patch
new file mode 100644
index 0000000..39d7474
--- /dev/null
+++ b/0001-hack-print-etc-mtab-in-is_root_mounted-test.patch
@@ -0,0 +1,34 @@
+From 4d6323cb948768dfd42d48f960baa8cb41c00a36 Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones@redhat.com>
+Date: Tue, 1 Feb 2011 12:28:51 +0000
+Subject: [PATCH] hack: print /etc/mtab in is_root_mounted test.
+
+---
+ daemon/mount.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/daemon/mount.c b/daemon/mount.c
+index c584f81..2b5433b 100644
+--- a/daemon/mount.c
++++ b/daemon/mount.c
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <mntent.h>
+ 
++#include "ignore-value.h"
+ #include "daemon.h"
+ #include "actions.h"
+ 
+@@ -40,6 +41,9 @@ is_root_mounted (void)
+   FILE *fp;
+   struct mntent *m;
+ 
++  if (verbose)
++    ignore_value (system ("cat /etc/mtab >&2"));
++
+   fp = setmntent ("/etc/mtab", "r");
+   if (fp == NULL) {
+     perror ("/etc/mtab");
+-- 
+1.7.3.5
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 7cfef94..178ff97 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.9.7
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -40,6 +40,9 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:        libguestfs-1.7.13-no-fuse-test.patch
 
+# Hack to debug build error.
+Patch1:        0001-hack-print-etc-mtab-in-is_root_mounted-test.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -426,6 +429,7 @@ php-%{name} contains PHP bindings for %{name}.
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 mkdir -p daemon/m4
 
@@ -498,6 +502,10 @@ echo "======================================================================"
 # it produces masses of output in the build.log.
 export LIBGUESTFS_DEBUG=1
 
+# Enable trace.  Since libguestfs 1.9.7 this produces 'greppable'
+# output even when combined with trace (see RHBZ#673477).
+export LIBGUESTFS_TRACE=1
+
 # Uncomment one of these, depending on whether you want to
 # do a very long and thorough test ('make check') or just
 # a quick test to see if things generally work.
@@ -753,6 +761,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb  1 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.7-2
+- Enable trace in 'make check' section.
+- Add hack to track down problem in is_root_mounted (only affects Koji).
+
 * Sun Jan 30 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.7-1
 - New upstream version 1.9.7.