- Add patch to add e2fsprogs to the appliance.

- Add patch to fix GFS kernel module problem.

libguestfs-1.3.21-Explicitly-depend-on-e2fsprogs.patch

@@ -0,0 +1,25 @@
+From 9928498ad87ed1d7a1c191d5637d36d5f9b09ee4 Mon Sep 17 00:00:00 2001
+From: Richard Jones <rjones@redhat.com>
+Date: Mon, 28 Jun 2010 13:51:42 +0100
+Subject: [PATCH 2/2] Explicitly depend on e2fsprogs.
+
+See: http://lists.fedoraproject.org/pipermail/devel/2010-June/137953.html
+---
+ appliance/packagelist.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/appliance/packagelist.in b/appliance/packagelist.in
+index 3c38978..16dc88d 100644
+--- a/appliance/packagelist.in
++++ b/appliance/packagelist.in
+@@ -12,6 +12,7 @@
+   augeas-libs
+   btrfs-progs
+   diffutils
++  e2fsprogs
+   /* e4fsprogs only exists on RHEL 5, will be ignored everywhere else. */
+   e4fsprogs
+   gfs-utils
+-- 
+1.6.6.1
+

libguestfs-1.3.21-Fix-gfs2-support-by-adding-required-kernel-modules.patch

@@ -0,0 +1,24 @@
+From 61adbba900a4150110d9fcd20097b3a5c249e6c7 Mon Sep 17 00:00:00 2001
+From: Richard Jones <rjones@redhat.com>
+Date: Mon, 28 Jun 2010 09:13:36 +0100
+Subject: [PATCH 1/2] Fix gfs2 support by adding required kernel modules.
+
+---
+ appliance/kmod.whitelist.in |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/appliance/kmod.whitelist.in b/appliance/kmod.whitelist.in
+index b225f30..0a92122 100644
+--- a/appliance/kmod.whitelist.in
++++ b/appliance/kmod.whitelist.in
+@@ -65,3 +65,7 @@ crc*.ko
+ libcrc*.ko
+ 
+ loop.ko
++
++gfs2.ko
++dlm.ko
++configfs.ko
+-- 
+1.6.6.1
+

libguestfs.spec

@@ -42,7 +42,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.3.21
-Release:       3%{?dist}
+Release:       4%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -52,6 +52,10 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:        libguestfs-1.0.79-no-fuse-test.patch
 
+# Upstream patches to fix GFS and e2fsprogs problems.
+Patch1:        libguestfs-1.3.21-Fix-gfs2-support-by-adding-required-kernel-modules.patch
+Patch2:        libguestfs-1.3.21-Explicitly-depend-on-e2fsprogs.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -389,6 +393,8 @@ Requires:      jpackage-utils
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 mkdir -p daemon/m4
 
@@ -694,8 +700,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Jun 28 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.21-3
+* Mon Jun 28 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.21-4
 - Explicitly depend on e2fsprogs.
+- Add patch to add e2fsprogs to the appliance.
+- Add patch to fix GFS kernel module problem.
 
 * Fri Jun 25 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:1.3.21-2
 - Rebuild