Allow more ext filesystem kmods (Charles Duffy).

[libguestfs.git] / make-initramfs.sh.in

diff --git a/make-initramfs.sh.in b/make-initramfs.sh.in
index b8faa3b..aa61811 100755 (executable)
--- a/make-initramfs.sh.in
+++ b/make-initramfs.sh.in
@@ -41,6 +41,7 @@ modules="
 -i procps
 -i strace
 -i util-linux-ng
+-i zerofree
 "
 
 # Decide on names for the final output.  These have to match Makefile.am.
@@ -80,8 +81,10 @@ rm -f $koutput
   -a ! -name 'virtio_pci.ko' \
   -a ! -name 'virtio_ring.ko' \
   -a ! -name 'ext2.ko' \
-  -a ! -name 'ext4.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' \
@@ -122,6 +125,7 @@ rm resolv.conf.new
 # Create the init script.
 cat > init.new <<'__EOF__'
 #!/bin/sh
+echo Starting /init script ...
 PATH=/sbin:/usr/sbin:$PATH
 MAKEDEV mem null port zero core full ram tty console fd \
   hda hdb hdc hdd sda sdb sdc sdd loop sd
@@ -142,6 +146,10 @@ __EOF__
 @FEBOOTSTRAP_INSTALL@ initramfs init.new /init 0755 root.root
 rm init.new
 
+# Just in case the kernel isn't looking for /init, make /sbin/init
+# be our script, not the real init.
+#@FEBOOTSTRAP_RUN@ initramfs -- ln -f /init /sbin/init
+
 # Copy the daemon into the filesystem.
 @FEBOOTSTRAP_INSTALL@ initramfs @abs_builddir@/daemon/guestfsd /sbin/guestfsd 0755 root.root