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

diff --git a/make-initramfs.sh.in b/make-initramfs.sh.in
index ccbb86a..b6e7820 100755
--- a/make-initramfs.sh.in
+++ b/make-initramfs.sh.in
@@ -20,16 +20,29 @@
 
 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 nfs-utils -i util-linux-ng -i MAKEDEV -i net-tools"
-
-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 binutils
+-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
+-i zerofree
+"
 
 # Decide on names for the final output.  These have to match Makefile.am.
 output=initramfs.@REPO@.@host_cpu@.img
@@ -38,49 +51,77 @@ rm -f $output
 rm -f $koutput
 
 # Create the basic initramfs.
-@FEBOOTSTRAP@ $modules @REPO@ initramfs @MIRROR@
+@FEBOOTSTRAP@ $modules -u @UPDATES@ @REPO@ initramfs @MIRROR@
+
+# /sysroot is where the guest root filesystem will be mounted.
+@FEBOOTSTRAP_RUN@ initramfs -- mkdir -p --mode=0777 /sysroot
+
+# Create /tmp if it is missing.
+@FEBOOTSTRAP_RUN@ initramfs -- mkdir -p --mode=0777 /tmp
 
 # Nuke some stuff.  The kernel pulls mkinitrd and plymouth which pulls in
 # all of Python.  Sheez.
-find initramfs -name '*plymouth*' -print0 | xargs -0 rm -rf
-find initramfs -name '*python*' -print0 | xargs -0 rm -rf
+(cd initramfs && find -name '*plymouth*' -print0) |
+  xargs -0 @FEBOOTSTRAP_RUN@ initramfs -- rm -rf
+(cd initramfs && find -name '*python*' -print0) |
+  xargs -0 @FEBOOTSTRAP_RUN@ initramfs -- rm -rf
+
+# In Fedora >= 11, it pulls in all of Perl from somewhere.  Nuke from orbit.
+@FEBOOTSTRAP_RUN@ initramfs -- rm -rf /usr/lib/perl5 /usr/lib64/perl5
+
+# 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 any drivers (which take up most of the space).
-# (We need to keep kernel/net/sunrpc for NFS)
-#rm -rf initramfs/lib/modules/*/kernel/{drivers,sound}
-rm -rf initramfs/lib/modules/*/kernel/arch/x86/kvm
+# 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 '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 -print0 ) |
+  xargs -0 @FEBOOTSTRAP_RUN@ initramfs -- rm
 
 # Pull the kernel out into the current directory.  We don't want it in
 # the initramfs image.
-mv initramfs/boot/vmlinuz* $koutput
-rm -rf initramfs/boot
+cp initramfs/boot/vmlinuz* $koutput
+@FEBOOTSTRAP_RUN@ initramfs -- rm -rf boot
 
 # Minimize the image.
 @FEBOOTSTRAP_MINIMIZE@ initramfs
 
 # Add some missing configuration files.
 if [ ! -f initramfs/etc/hosts ]; then
-    cat > initramfs/etc/hosts.new <<'__EOF__'
+    cat > hosts.new <<'__EOF__'
 127.0.0.1 guestfs localhost.localdomain localhost
 ::1       localhost6.localdomain6 localhost6
 __EOF__
-    @FEBOOTSTRAP_RUN@ initramfs -- \
-	install -m 0644 -o root -g root /etc/hosts.new /etc/hosts
-    rm initramfs/etc/hosts.new
+    @FEBOOTSTRAP_INSTALL@ initramfs hosts.new /etc/hosts 0644 root.root
+    rm hosts.new
 fi
 
 if [ ! -f initramfs/etc/fstab ]; then
     @FEBOOTSTRAP_RUN@ initramfs -- touch /etc/fstab
 fi
 
-echo nameserver 10.0.2.3 > initramfs/etc/resolv.conf.new
-@FEBOOTSTRAP_RUN@ initramfs -- \
-    install -m 0644 -o root -g root /etc/resolv.conf.new /etc/resolv.conf
-rm initramfs/etc/resolv.conf.new
+echo nameserver 10.0.2.3 > resolv.conf.new
+@FEBOOTSTRAP_INSTALL@ initramfs resolv.conf.new /etc/resolv.conf 0644 root.root
+rm resolv.conf.new
 
 # Create the init script.
-cat > initramfs/init.new <<'__EOF__'
+cat > init.new <<'__EOF__'
 #!/bin/sh
 PATH=/sbin:/usr/sbin:$PATH
 MAKEDEV mem null port zero core full ram tty console fd \
@@ -88,33 +129,22 @@ 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 nfsd 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
-rpcbind
-rpc.statd
-rpc.nfsd 4
-rpc.mountd
+exec guestfsd -f
 __EOF__
 
-if [ "x$debug" != "xyes" ]; then
-    echo exec guestfsd -f >> initramfs/init.new
-else
-    echo guestfsd >> initramfs/init.new
-    echo exec bash -i >> initramfs/init.new
-fi
-
-@FEBOOTSTRAP_RUN@ initramfs -- install -m 0755 -o root -g root /init.new /init
-rm initramfs/init.new
+@FEBOOTSTRAP_INSTALL@ initramfs init.new /init 0755 root.root
+rm init.new
 
 # Copy the daemon into the filesystem.
-cp @abs_builddir@/daemon/guestfsd initramfs/sbin/guestfsd.new
-@FEBOOTSTRAP_RUN@ initramfs -- \
-  install -m 0755 -o root -g root /sbin/guestfsd.new /sbin/guestfsd
-rm initramfs/sbin/guestfsd.new
+@FEBOOTSTRAP_INSTALL@ initramfs @abs_builddir@/daemon/guestfsd /sbin/guestfsd 0755 root.root
 
 # Generate final image.
 @FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t