Pull in febootstrap-supermin-helper (C version) from libguestfs.

This commit also pulls in the automake C dependencies and gnulib.

febootstrap-supermin-helper is modified so that it has the
--kmods option (to read the whitelist, from the old shell script),
and so that it can read supermin appliances composed of multiple
parts from out of a directory.

Also: Updates to documentation.

.gitignore

@@ -1,26 +1,50 @@
 *~
-febootstrap*.8
-febootstrap*.txt
-febootstrap-*.tar.gz
+*.o
+*.a
+.deps
 Makefile.in
 Makefile
 aclocal.m4
+/arg-nonnull.h
 autom4te.cache
+/c++defs.h
+compile
+config.guess
 config.h.in
 config.h
 config.log
 config.status
+config.sub
 configure
+depcomp
 febootstrap
 febootstrap-run
 febootstrap-install
 febootstrap-minimize
 febootstrap-to-initramfs
 febootstrap-to-supermin
 febootstrap-supermin-helper
+febootstrap*.8
+febootstrap*.txt
+febootstrap-*.tar.gz
+lib/alloca.h
+lib/arg-nonnull.h
+lib/c++defs.h
+lib/dirent.h
+lib/fcntl.h
+lib/stdio.h
+lib/stdlib.h
+lib/string.h
+lib/sys/
+lib/time.h
+lib/unistd.h
+lib/warn-on-use.h
+lib/wchar.h
+INSTALL
 install-sh
 missing
 stamp-h1
+/warn-on-use.h
 examples/guestfs
 examples/*-initrd.img
 examples/guest-image

Makefile.am

@@ -1,5 +1,5 @@
 # febootstrap Makefile.am
-# (C) Copyright 2009 Red Hat Inc.
+# (C) Copyright 2009-2010 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,15 +17,18 @@
 #
 # Written by Richard W.M. Jones <rjones@redhat.com>
 
-SUBDIRS = examples
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = lib examples
 
 bin_SCRIPTS = \
 	febootstrap \
 	febootstrap-run \
 	febootstrap-install \
 	febootstrap-minimize \
 	febootstrap-to-initramfs \
-	febootstrap-to-supermin \
+	febootstrap-to-supermin
+bin_PROGRAMS = \
 	febootstrap-supermin-helper
 DISTCLEANFILES = $(bin_SCRIPTS)
 
@@ -65,11 +68,9 @@ febootstrap-to-supermin: febootstrap-to-supermin.sh
 	chmod 0555 $@-t
 	mv $@-t $@
 
-febootstrap-supermin-helper: febootstrap-supermin-helper.sh
-	rm -f $@
-	cp $< $@-t
-	chmod 0555 $@-t
-	mv $@-t $@
+febootstrap_supermin_helper_SOURCES = febootstrap-supermin-helper.c
+febootstrap_supermin_helper_CFLAGS = -Wall -Ilib
+febootstrap_supermin_helper_LDADD = $(LTLIBINTL) -Llib -lgnu
 
 man_MANS = \
 	febootstrap.8 \
@@ -174,4 +175,4 @@ EXTRA_DIST = \
 	  febootstrap-to-supermin.sh \
 	febootstrap-supermin-helper.8 febootstrap-supermin-helper.txt \
 	  febootstrap-supermin-helper.pod \
-	  febootstrap-supermin-helper.sh
+	m4/gnulib-cache.m4

README

@@ -1,5 +1,6 @@
 febootstrap - Bootstrap a basic Fedora system
 by Richard W.M. Jones (rjones@redhat.com)
+http://people.redhat.com/~rjones/febootstrap
 ----------------------------------------------------------------------
 
 febootstrap is a Fedora equivalent to Debian's debootstrap.  You can
@@ -32,7 +33,7 @@ Requirements
 
   bash
 
-  MAKEDEV
+  gcc
 
   qemu
     - If you want to test-run your systems.

autogen.sh

@@ -1,5 +1,9 @@
 #!/bin/sh -
 
+if [ -d ../gnulib ]; then
+    ../gnulib/gnulib-tool --update
+fi
+
 export AUTOMAKE='automake --foreign --add-missing'
 autoreconf
 ./configure "$@"

configure.ac

@@ -1,5 +1,5 @@
 dnl febootstrap configure.ac
-dnl (C) Copyright 2009 Red Hat Inc.
+dnl (C) Copyright 2009-2010 Red Hat Inc.
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -17,9 +17,26 @@ dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 dnl
 dnl Written by Richard W.M. Jones <rjones@redhat.com>
 
-AC_INIT(febootstrap,2.6)
+AC_INIT(febootstrap,2.7)
 AM_INIT_AUTOMAKE
 
+dnl Check for basic C environment.
+AC_PROG_CC_STDC
+gl_EARLY
+
+AC_PROG_INSTALL
+AC_PROG_CPP
+
+AC_C_PROTOTYPES
+test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant])
+
+AM_PROG_CC_C_O
+
+dnl Check support for 64 bit file offsets.
+AC_SYS_LARGEFILE
+
+gl_INIT
+
 AC_CHECK_PROG(PERLDOC,[perldoc],[perldoc],[no])
 if test "x$PERLDOC" = "xno" ; then
   AC_MSG_WARN([perldoc not found - install perl to make man pages])
@@ -42,5 +59,5 @@ if test "x$YUM" = "xno" ; then
 fi
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile examples/Makefile])
+AC_CONFIG_FILES([lib/Makefile Makefile examples/Makefile])
 AC_OUTPUT

febootstrap-install.pod

@@ -32,7 +32,7 @@ Richard W.M. Jones <rjones @ redhat . com>
 =head1 COPYRIGHT
 
 (C) Copyright 2009 Red Hat Inc.,
-L<http://et.redhat.com/~rjones/febootstrap>.
+L<http://people.redhat.com/~rjones/febootstrap>.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

febootstrap-minimize.pod

@@ -156,7 +156,7 @@ Richard W.M. Jones <rjones @ redhat . com>
 =head1 COPYRIGHT
 
 (C) Copyright 2009 Red Hat Inc.,
-L<http://et.redhat.com/~rjones/febootstrap>.
+L<http://people.redhat.com/~rjones/febootstrap>.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

febootstrap-run.pod

@@ -78,7 +78,7 @@ Richard W.M. Jones <rjones @ redhat . com>
 =head1 COPYRIGHT
 
 (C) Copyright 2009 Red Hat Inc.,
-L<http://et.redhat.com/~rjones/febootstrap>.
+L<http://people.redhat.com/~rjones/febootstrap>.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by