Depend on new febootstrap 2.0, and use febootstrap-install.

diff --git a/README b/README
index abf058e..cefcd78 100644 (file)
--- a/README
+++ b/README
@@ -31,7 +31,7 @@ Requirements
 - recent QEMU >= 0.10 with vmchannel support
   http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg01042.html
 
-- febootstrap >= 1.5
+- febootstrap >= 2.0
 
 - XDR, rpcgen
 

diff --git a/configure.ac b/configure.ac
index 67d626e..ade5989 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,10 @@ AC_CHECK_PROG([FEBOOTSTRAP_RUN],
        [febootstrap-run],[febootstrap-run],[no])
 test "x$FEBOOTSTRAP_RUN" = "xno" && \
      AC_MSG_ERROR([febootstrap-run must be installed])
+AC_CHECK_PROG([FEBOOTSTRAP_INSTALL],
+       [febootstrap-install],[febootstrap-install],[no])
+test "x$FEBOOTSTRAP_INSTALL" = "xno" && \
+     AC_MSG_ERROR([febootstrap-install must be installed])
 AC_CHECK_PROG([FEBOOTSTRAP_MINIMIZE],
        [febootstrap-minimize],[febootstrap-minimize],[no])
 test "x$FEBOOTSTRAP_MINIMIZE" = "xno" && \

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index 76b8fb2..4847910 100644 (file)
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -20,7 +20,7 @@ ExclusiveArch: %{ix86} x86_64
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
-BuildRequires: febootstrap >= 1.5
+BuildRequires: febootstrap >= 2.0
 BuildRequires: augeas-devel >= 0.5.0
 BuildRequires: readline-devel
 BuildRequires: qemu >= 0.10-7

diff --git a/make-initramfs.sh.in b/make-initramfs.sh.in
index ec03dc6..495ecc0 100755 (executable)
--- a/make-initramfs.sh.in
+++ b/make-initramfs.sh.in
@@ -53,37 +53,21 @@ 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
 
 # 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' \
@@ -100,12 +84,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
@@ -116,7 +101,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
 
@@ -125,7 +110,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.
@@ -148,11 +133,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

diff --git a/update-initramfs.sh.in b/update-initramfs.sh.in
index 5076dd3..080cfdd 100755 (executable)
--- a/update-initramfs.sh.in
+++ b/update-initramfs.sh.in
@@ -19,28 +19,14 @@
 # Update the daemon inside an existing initramfs.  Avoids the
 # timeconsuming rebuild.
 
+unset CDPATH
+
 set -e
 
 output=initramfs.@REPO@.@host_cpu@.img
 
-# 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"
-}
-
 # 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