X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=update-initramfs.sh.in;h=5076dd3283ac219df0225179187e877ace67d666;hp=89f629c40c0f5e46dd4bd4cf58c80fd8703ea656;hb=8f9f02d483b87c787d089cf9329f5f1b81d3a77e;hpb=207056e82372093fa5bc678a9e55a2abc33704fa

diff --git a/update-initramfs.sh.in b/update-initramfs.sh.in
index 89f629c..5076dd3 100755
--- a/update-initramfs.sh.in
+++ b/update-initramfs.sh.in
@@ -23,11 +23,24 @@ 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.
-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
+install_file @abs_builddir@/daemon/guestfsd /sbin/guestfsd 0755 root.root
 
 # Generate final image.
 @FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t