X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=make-initramfs.sh.in;h=690ca51a93813f23a21cdb04e7b1fd30321e692c;hp=b550ed926092d1592bb7ecc0cc4f277f3488fa14;hb=2df2819aa552d1cc7bf6a450aaf4d090a4341a68;hpb=6d5f69f81a888e26a425800c80d2892e10d74cea

diff --git a/make-initramfs.sh.in b/make-initramfs.sh.in
index b550ed9..690ca51 100755
--- a/make-initramfs.sh.in
+++ b/make-initramfs.sh.in
@@ -22,16 +22,24 @@ set -e
 
 unset CDPATH
 
-# If you want to do some extra debugging and diagnosis of the
-# initramfs image, then uncomment this line.  This makes the image
-# larger.
-debug=yes
-
-modules="-i kernel -i bash -i coreutils -i lvm2 -i ntfs-3g -i util-linux-ng -i MAKEDEV -i net-tools -i augeas-libs -i file"
-
-if [ "x$debug" = "xyes" ]; then
-    modules="$modules -i module-init-tools -i procps -i strace -i iputils"
-fi
+modules="
+-i augeas-libs
+-i bash
+-i coreutils
+-i file
+-i iputils
+-i kernel
+-i lvm2
+-i MAKEDEV
+-i module-init-tools
+-i net-tools
+-i ntfs-3g
+-i procps
+-i strace
+-i util-linux-ng
+-i dosfstools
+-i ntfsprogs
+"
 
 # Decide on names for the final output.  These have to match Makefile.am.
 output=initramfs.@REPO@.@host_cpu@.img
@@ -44,6 +52,11 @@ rm -f $koutput
 
 # /sysroot is where the guest root filesystem will be mounted.
 mkdir initramfs/sysroot
+@FEBOOTSTRAP_RUN@ initramfs -- chmod 0777 /sysroot
+
+# Create /tmp if it is missing.
+mkdir -p initramfs/tmp
+@FEBOOTSTRAP_RUN@ initramfs -- chmod 0777 /tmp
 
 # Make a safe 'install_file' function to install files into the
 # filesystem.  XXX We need a 'febootstrap-install' utility.
@@ -76,6 +89,12 @@ find initramfs/lib/modules/*/kernel \
   -a ! -name 'ext4.ko' \
   -a ! -name 'crc16.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 -delete
 
 # Pull the kernel out into the current directory.  We don't want it in
@@ -119,15 +138,9 @@ modprobe 8139cp
 /sbin/route add default gw 10.0.2.2
 lvm vgscan --ignorelockingfailure
 lvm vgchange -ay --ignorelockingfailure
+exec guestfsd -f
 __EOF__
 
-if [ "x$debug" != "xyes" ]; then
-    echo exec guestfsd -f >> init.new
-else
-    echo guestfsd >> init.new
-    echo exec bash -i >> init.new
-fi
-
 install_file init.new /init 0755 root.root
 rm init.new