X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2Fmake.sh.in;h=8f3b212727f1f636d499962b4474e4e557846e5d;hb=14ec52d3dc332a02dcb7d95b5f5d21fd863fc99e;hp=b39b13d6dfb155b0ab309066ab44dd89925a3557;hpb=2e25c4255746b144932f84b7b6671d7d03f52278;p=libguestfs.git

diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index b39b13d..8f3b212 100755
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -74,35 +74,28 @@ rm -f $koutput
 # Anaconda?  JPEG images?
 @FEBOOTSTRAP_RUN@ initramfs -- rm -rf /usr/lib/anaconda-runtime
 
-# Modules take up nearly half of the image.  It's a rough guess that
-# we don't need many drivers (which take up most of the space).
-(cd initramfs && find lib/modules/*/kernel \
-  -name '*.ko' \
-  -a ! -name 'virtio.ko' \
-  -a ! -name 'virtio_net.ko' \
-  -a ! -name 'virtio_pci.ko' \
-  -a ! -name 'virtio_ring.ko' \
-  -a ! -name 'ext2.ko' \
-  -a ! -name 'ext3.ko' \
-  -a ! -name 'ext4*.ko' \
-  -a ! -name 'crc16.ko' \
-  -a ! -name 'jbd.ko' \
-  -a ! -name 'jbd2.ko' \
-  -a ! -name 'fuse.ko' \
-  -a ! -name 'vfat.ko' \
-  -a ! -name 'fat.ko' \
-  -a ! -name 'udf.ko' \
-  -a ! -name 'crc_itu_t.ko' \
-  -a ! -name 'nls_utf8.ko' \
-  -a ! -name 'dm-*.ko' \
-  -a ! -name 'cramfs.ko' \
-  -a ! -name 'squashfs.ko' \
-  -a ! -name 'hfsplus.ko' \
-  -a ! -name 'ufs.ko' \
-  -a ! -name 'exportfs.ko' \
-  -a ! -name 'xfs.ko' \
-  -a -print0 ) |
-  xargs -0 @FEBOOTSTRAP_RUN@ initramfs -- rm
+# Don't need any firmware.
+@FEBOOTSTRAP_RUN@ initramfs -- rm -rf /lib/firmware
+
+# Don't need any keyboard maps.
+@FEBOOTSTRAP_RUN@ initramfs -- rm -rf /lib/kbd
+
+# Kernel modules take up nearly half of the image.  Only include ones
+# which are on the whitelist.
+grep -v '^[[:space:]]*$' < appliance/kmod.whitelist |
+  grep -v '^#' > kmod.whitelist.tmp
+exec 5<kmod.whitelist.tmp
+whitelist=
+while read kmod 0<&5; do
+    whitelist="$whitelist -a -not -name $kmod"
+done
+exec 5<&-
+rm kmod.whitelist.tmp
+#echo whitelist=$whitelist
+
+(cd initramfs && \
+  find lib/modules/*/kernel -name '*.ko' $whitelist -a -print0 ) |
+  xargs -0 febootstrap-run initramfs -- rm
 
 # Pull the kernel out into the current directory.  We don't want it in
 # the initramfs image.
@@ -169,11 +162,8 @@ rm init.new
 # be our script, not the real init.
 #@FEBOOTSTRAP_RUN@ initramfs -- ln -f /init /sbin/init
 
-# Copy the daemon into the filesystem.
-@FEBOOTSTRAP_INSTALL@ initramfs daemon/guestfsd /sbin/guestfsd 0755 root.root
-
-# Generate final image.
-@FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t
-mv $output-t $output
-ls -lh $output
 ls -lh $koutput
+
+# Now directly run the update script to copy/update the daemon in the
+# initramfs.
+cd appliance && bash update.sh