X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=make-initramfs.sh.in;h=aa61811cdd2e7a2f6ff1b5bb86e50b7df38a8d82;hb=e7d66edd8d481f162904d611bd499f968f2f74ef;hp=b6e7820a82f8ea162ba5e9ea410ef4e6391e8d32;hpb=d901cc916102f1aaccfb73396b48aa303e5b8cd7;p=libguestfs.git

diff --git a/make-initramfs.sh.in b/make-initramfs.sh.in
index b6e7820..aa61811 100755
--- a/make-initramfs.sh.in
+++ b/make-initramfs.sh.in
@@ -81,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' \
@@ -123,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
@@ -143,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