From: Richard W.M. Jones <rjones@redhat.com>
Date: Thu, 14 Mar 2013 13:24:30 +0000 (+0000)
Subject: supermin >= 4 is now required, instead of febootstrap.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=cb663bc806754675aa934ec917eb45018dc86c00;p=a-fedora-appliance.git

supermin >= 4 is now required, instead of febootstrap.
---

diff --git a/README b/README
index 3c09ebb..3cea48d 100644
--- a/README
+++ b/README
@@ -23,6 +23,9 @@ it for your own purposes.
 (2) If you are building from the source tarball
 ----------------------------------------------------------------------
 
+'supermin' version 4 or above is required:
+http://people.redhat.com/~rjones/supermin/
+
 Do:
 
   ./configure
diff --git a/a-fedora-appliance.spec.in b/a-fedora-appliance.spec.in
index 971f610..f03c1c1 100644
--- a/a-fedora-appliance.spec.in
+++ b/a-fedora-appliance.spec.in
@@ -29,8 +29,8 @@ Requires:       @PACKAGELIST@
 
 BuildRequires:  createrepo
 
-BuildRequires:  febootstrap >= 3.3
-Requires(post): febootstrap-supermin-helper >= 3.3
+BuildRequires:  supermin >= 4.1.1
+Requires(post): supermin-helper >= 4.1.1
 
 Requires:       qemu-kvm >= 0.12
 
diff --git a/build-a-fedora-appliance.in b/build-a-fedora-appliance.in
index 69ca34d..d065f9d 100644
--- a/build-a-fedora-appliance.in
+++ b/build-a-fedora-appliance.in
@@ -27,4 +27,4 @@ supermindir="$1"
 shift
 
 arch="$(uname -m)"
-exec febootstrap-supermin-helper -f ext2 "$supermindir" "$arch" "$@"
+exec supermin-helper -f ext2 "$supermindir" "$arch" "$@"
diff --git a/configure.ac b/configure.ac
index b56fb92..0fc20e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,20 +47,17 @@ udev \
 "
 AC_SUBST([PACKAGELIST])
 
-dnl Check for febootstrap >= 3.0.
-AC_CHECK_PROG([FEBOOTSTRAP],
-              [febootstrap],[febootstrap],[no])
-test "x$FEBOOTSTRAP" = "xno" &&
-    AC_MSG_ERROR([febootstrap must be installed])
-dnl febootstrap 2.x did not support the --version parameter
-$FEBOOTSTRAP --version >&AS_MESSAGE_LOG_FD 2>&1 ||
-    AC_MSG_ERROR([febootstrap >= 3.0 must be installed, your version is too old])
+dnl Check for supermin >= 4.
+AC_CHECK_PROG([SUPERMIN],
+              [supermin],[supermin],[no])
+test "x$SUPERMIN" = "xno" &&
+    AC_MSG_ERROR([supermin >= 4 must be installed])
 
-dnl Pass a febootstrap --yum-config option.
-AC_MSG_CHECKING([if user requested febootstrap --yum-config option])
+dnl Pass a supermin --yum-config option.
+AC_MSG_CHECKING([if user requested supermin --yum-config option])
 AC_ARG_WITH([yum-config],
     [AS_HELP_STRING([--with-yum-config=FILE],
-      [pass febootstrap --yum-config option @<:@default=no@:>@])],
+      [pass supermin --yum-config option @<:@default=no@:>@])],
     [YUM_CONFIG="$withval"],
     [YUM_CONFIG=no])
 AC_MSG_RESULT([$YUM_CONFIG])
diff --git a/firstboot b/firstboot
index 9736c13..c888bc6 100755
--- a/firstboot
+++ b/firstboot
@@ -16,14 +16,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-# febootstrap doesn't run any RPM %pre or %post scripts.  For
+# supermin doesn't run any RPM %pre or %post scripts.  For
 # libguestfs this doesn't matter, but when trying to boot a real
 # distro it matters quite a bit.  This script runs once, the first
 # time the appliance boots.  It contains a selection of %post scripts
 # from important packages.
 #
 # In debootstrap, this is generated from the packages themselves.  We
-# should generate it for febootstrap too.  (XXX)
+# should generate it for supermin too.  (XXX)
 
 # There is no /etc/fstab in Fedora.  It is possibly generated by
 # Anaconda for a normal distro.  Fake one here.
diff --git a/make.sh.in b/make.sh.in
index 3f21a86..928c620 100644
--- a/make.sh.in
+++ b/make.sh.in
@@ -20,5 +20,5 @@ if [ "x@YUM_CONFIG@" != "xno" ]; then
     extra="--yum-config @YUM_CONFIG@"
 fi
 
-echo @FEBOOTSTRAP@ -v -o supermin.d --names @PACKAGELIST@ $extra
-@FEBOOTSTRAP@ -v -o supermin.d --names @PACKAGELIST@ $extra
+echo @SUPERMIN@ -v -o supermin.d --names @PACKAGELIST@ $extra
+@SUPERMIN@ -v -o supermin.d --names @PACKAGELIST@ $extra