diff --git a/0001-hack-Allow-time-for-etc-mtab-to-be-updated-print-con.patch b/0001-hack-Allow-time-for-etc-mtab-to-be-updated-print-con.patch new file mode 100644 index 0000000..70f9f59 --- /dev/null +++ b/0001-hack-Allow-time-for-etc-mtab-to-be-updated-print-con.patch @@ -0,0 +1,25 @@ +From 529d2f57621a3a525759ca9c09f605f2f2f1ae66 Mon Sep 17 00:00:00 2001 +From: Richard W.M. Jones +Date: Tue, 1 Feb 2011 13:34:20 +0000 +Subject: [PATCH] hack: Allow time for /etc/mtab to be updated, print contents. + +--- + images/guest-aux/make-windows-img.sh | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/images/guest-aux/make-windows-img.sh b/images/guest-aux/make-windows-img.sh +index 5a0cd6d..ee464ac 100755 +--- a/images/guest-aux/make-windows-img.sh ++++ b/images/guest-aux/make-windows-img.sh +@@ -39,6 +39,8 @@ mkfs ntfs /dev/sda2 + + # Enough to fool inspection API. + mount-options "" /dev/sda2 / ++sleep 5 ++debug sh "cat /etc/mtab" + mkdir-p /Windows/System32/Config + + upload guest-aux/windows-software /Windows/System32/Config/SOFTWARE +-- +1.7.3.5 + 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 deleted file mode 100644 index 39d7474..0000000 --- a/0001-hack-print-etc-mtab-in-is_root_mounted-test.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4d6323cb948768dfd42d48f960baa8cb41c00a36 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -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 - #include - -+#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 178ff97..022e655 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: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -40,8 +40,7 @@ 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 +Patch1: 0001-hack-Allow-time-for-etc-mtab-to-be-updated-print-con.patch # Basic build requirements: BuildRequires: /usr/bin/pod2man @@ -761,7 +760,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Feb 1 2011 Richard W.M. Jones - 1:1.9.7-2 +* Tue Feb 1 2011 Richard W.M. Jones - 1:1.9.7-3 - Enable trace in 'make check' section. - Add hack to track down problem in is_root_mounted (only affects Koji).