X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=make-initramfs.sh.in;h=f27dd3f683e19632d2606ad20f2ec3029f3a6b52;hp=3dbac6359905cbfacf5ef2f82ccbc5c4d4f0a9bd;hb=fa7c8bb79b45aecdf65ed93635a42f3fdf301134;hpb=b4d2a01828e5de85e5eee3631f7fe3925a0312ca

diff --git a/make-initramfs.sh.in b/make-initramfs.sh.in
index 3dbac63..f27dd3f 100755
--- a/make-initramfs.sh.in
+++ b/make-initramfs.sh.in
@@ -20,16 +20,27 @@
 
 set -e
 
-# 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"
-
-if [ "x$debug" = "xyes" ]; then
-    modules="$modules -i module-init-tools -i procps -i strace -i iputils"
-fi
+unset CDPATH
+
+modules="
+-i augeas-libs
+-i bash
+-i coreutils
+-i dosfstools
+-i file
+-i grub
+-i iputils
+-i kernel
+-i lvm2
+-i MAKEDEV
+-i module-init-tools
+-i net-tools
+-i ntfs-3g
+-i ntfsprogs
+-i procps
+-i strace
+-i util-linux-ng
+"
 
 # Decide on names for the final output.  These have to match Makefile.am.
 output=initramfs.@REPO@.@host_cpu@.img
@@ -42,6 +53,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.
@@ -68,10 +84,21 @@ find initramfs -name '*python*' -print0 | xargs -0 rm -rf
 # we don't need many drivers (which take up most of the space).
 find initramfs/lib/modules/*/kernel \
   -name '*.ko' \
-  -a ! -name 'mii.ko' \
-  -a ! -name '8139cp.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 '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 ! -name 'dm-*.ko' \
   -a -delete
 
 # Pull the kernel out into the current directory.  We don't want it in
@@ -109,21 +136,17 @@ MAKEDEV mem null port zero core full ram tty console fd \
 mount -t proc /proc /proc
 mount -t sysfs /sys /sys
 mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts
-modprobe 8139cp
+modprobe virtio_pci
+modprobe virtio_net
+modprobe dm_mod ||:
 /sbin/ifconfig lo 127.0.0.1
 /sbin/ifconfig eth0 10.0.2.10
 /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