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

diff --git a/make-initramfs.sh.in b/make-initramfs.sh.in
index f27dd3f..b6e7820 100755
--- a/make-initramfs.sh.in
+++ b/make-initramfs.sh.in
@@ -25,6 +25,7 @@ unset CDPATH
 modules="
 -i augeas-libs
 -i bash
+-i binutils
 -i coreutils
 -i dosfstools
 -i file
@@ -40,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.
@@ -52,37 +54,27 @@ rm -f $koutput
 @FEBOOTSTRAP@ $modules -u @UPDATES@ @REPO@ initramfs @MIRROR@
 
 # /sysroot is where the guest root filesystem will be mounted.
-mkdir initramfs/sysroot
-@FEBOOTSTRAP_RUN@ initramfs -- chmod 0777 /sysroot
+@FEBOOTSTRAP_RUN@ initramfs -- mkdir -p --mode=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.
-# Usage: install_file <local-file> <target-pathname> mode owner[.group]
-install_file ()
-{
-    cp "$1" initramfs/"$2"
-    # Get the inode of the new file and remove it from fakeroot.log.
-    ino=$(ls -i initramfs/"$2" | awk '{print $1}')
-    cp initramfs/fakeroot.log fakeroot.log.old
-    grep -v "ino=$ino," fakeroot.log.old > initramfs/fakeroot.log
-    rm fakeroot.log.old
-    # Set mode, owner and group as desired.
-    @FEBOOTSTRAP_RUN@ initramfs -- chmod "$3" "$2"
-    @FEBOOTSTRAP_RUN@ initramfs -- chown "$4" "$2"
-}
+@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 many drivers (which take up most of the space).
-find initramfs/lib/modules/*/kernel \
+(cd initramfs && find lib/modules/*/kernel \
   -name '*.ko' \
   -a ! -name 'virtio.ko' \
   -a ! -name 'virtio_net.ko' \
@@ -99,12 +91,13 @@ find initramfs/lib/modules/*/kernel \
   -a ! -name 'crc_itu_t.ko' \
   -a ! -name 'nls_utf8.ko' \
   -a ! -name 'dm-*.ko' \
-  -a -delete
+  -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
@@ -115,7 +108,7 @@ if [ ! -f initramfs/etc/hosts ]; then
 127.0.0.1 guestfs localhost.localdomain localhost
 ::1       localhost6.localdomain6 localhost6
 __EOF__
-    install_file hosts.new /etc/hosts 0644 root.root
+    @FEBOOTSTRAP_INSTALL@ initramfs hosts.new /etc/hosts 0644 root.root
     rm hosts.new
 fi
 
@@ -124,7 +117,7 @@ if [ ! -f initramfs/etc/fstab ]; then
 fi
 
 echo nameserver 10.0.2.3 > resolv.conf.new
-install_file resolv.conf.new /etc/resolv.conf 0644 root.root
+@FEBOOTSTRAP_INSTALL@ initramfs resolv.conf.new /etc/resolv.conf 0644 root.root
 rm resolv.conf.new
 
 # Create the init script.
@@ -147,11 +140,11 @@ lvm vgchange -ay --ignorelockingfailure
 exec guestfsd -f
 __EOF__
 
-install_file init.new /init 0755 root.root
+@FEBOOTSTRAP_INSTALL@ initramfs init.new /init 0755 root.root
 rm init.new
 
 # Copy the daemon into the filesystem.
-install_file @abs_builddir@/daemon/guestfsd /sbin/guestfsd 0755 root.root
+@FEBOOTSTRAP_INSTALL@ initramfs @abs_builddir@/daemon/guestfsd /sbin/guestfsd 0755 root.root
 
 # Generate final image.
 @FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t