From: Richard Jones <rjones@trick.home.annexia.org>
Date: Tue, 16 Jun 2009 09:55:36 +0000 (+0100)
Subject: Don't compress the supermin base initramfs.
X-Git-Tag: 1.0.48~1
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=71322ebf4ee7dfb53db344aaedd70518a3c7a552;p=libguestfs.git

Don't compress the supermin base initramfs.
---

diff --git a/README b/README
index 92bfc07..3dea215 100644
--- a/README
+++ b/README
@@ -37,7 +37,7 @@ Requirements
 - recent QEMU >= 0.10 with vmchannel support
   http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg01042.html
 
-- febootstrap >= 2.0
+- febootstrap >= 2.3
 
 - fakeroot
 
diff --git a/appliance/supermin-make.sh.in b/appliance/supermin-make.sh.in
index b993833..c40dec9 100755
--- a/appliance/supermin-make.sh.in
+++ b/appliance/supermin-make.sh.in
@@ -28,6 +28,9 @@ cd @top_builddir@
 output=appliance/initramfs.@REPO@.@host_cpu@.supermin.img
 
 # Generate final image.
-@FEBOOTSTRAP_TO_INITRAMFS@ --files=$(pwd)/appliance/supermin.incfiles initramfs > $output-t
+@FEBOOTSTRAP_TO_INITRAMFS@ \
+  --nocompress \
+  --files=$(pwd)/appliance/supermin.incfiles \
+  initramfs > $output-t
 mv $output-t $output
 ls -lh $output
diff --git a/configure.ac b/configure.ac
index f8ed7ba..bee1a59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,6 +204,22 @@ version of febootstrap.
 ])
     fi
     AC_MSG_RESULT([yes])
+
+    dnl Check febootstrap-to-initramfs accepts the --nocompress option
+    dnl (febootstrap >= 2.3).
+    AC_MSG_CHECKING([for --nocompress support in $FEBOOTSTRAP_TO_INITRAMFS])
+    out=`$FEBOOTSTRAP_TO_INITRAMFS 2>&1 ||:`
+    echo "febootstrap_to_initramfs test command output: $out" >&AS_MESSAGE_LOG_FD
+    if ! echo $out | grep -sq -- "--nocompress" ; then
+        AC_MSG_RESULT([no])
+	AC_MSG_FAILURE(
+[febootstrap-to-initramfs does not support the --nocompress option.
+
+To build the supermin appliance, you need to upgrade to the latest
+version of febootstrap.
+])
+    fi
+    AC_MSG_RESULT([yes])
 fi
 
 dnl Readline.