X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2Fmake.sh.in;h=cb243b55c6dfcf6bd5fda2f449d8ec55ce9e29e6;hb=67030c6ef2b89ab98ed30d2ddc8a180c28395312;hp=bab0529c37017c28802ef739b6b5ebf02ac8ae64;hpb=6d75ce8e6ca1f3f0a946ee4e214f6d2bff07adc4;p=libguestfs.git

diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index bab0529..cb243b5 100755
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -20,16 +20,21 @@ unset CDPATH
 
 set -e
 
-# XXX Distro-dependent in future.
-excludes="--exclude '^perl' --exclude '^python' --exclude '^fedora-logos' --exclude '^redhat-logos' --exclude '^dracut' --exclude '^upstart' --exclude '^plymouth' --exclude '^systemd' --exclude '^linux-firmware' --exclude '^kbd-misc'"
+# Turn excludelist file into command line arguments.
+exec 5<excludelist
+while read regexp <&5; do
+    excludes="$excludes --exclude $regexp"
+done
+exec 5<&-
 
 # Run febootstrap on the package list.
-if [ -z "@PACKAGE_DIRECTORY@" ]; then
-    @FEBOOTSTRAP@ -v -o supermin.d $excludes --names $(< packagelist )
-else
-    @FEBOOTSTRAP@ -v -o supermin.d $excludes @PACKAGE_DIRECTORY@/*
+if [ "x@FEBOOTSTRAP_YUM_CONFIG@" != "xno" ]; then
+    extra="--yum-config @FEBOOTSTRAP_YUM_CONFIG@"
 fi
 
+echo @FEBOOTSTRAP@ -v -o supermin.d --names $(< packagelist ) $excludes $extra
+@FEBOOTSTRAP@ -v -o supermin.d --names $(< packagelist ) $excludes $extra
+
 # Remove some things that we don't want in the appliance.  This is
 # copied from the old febootstrap-minimize.  However minimization is
 # not so important now that we are caching the appliance.