From fe6820c1bbaec015a883804545362a8c9b6b4583 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@redhat.com>
Date: Wed, 1 Apr 2009 16:08:01 +0100
Subject: [PATCH] Correct permissions problem in root filesystem by using
 febootstrap-run properly.

---
 make-initramfs.sh.in | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/make-initramfs.sh.in b/make-initramfs.sh.in
index fe3635d..0812edb 100755
--- a/make-initramfs.sh.in
+++ b/make-initramfs.sh.in
@@ -60,21 +60,24 @@ rm -rf initramfs/boot
 
 # Add some missing configuration files.
 if [ ! -f initramfs/etc/hosts ]; then
-    cat > initramfs/etc/hosts <<'__EOF__'
+    cat > initramfs/etc/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
 fi
 
 if [ ! -f initramfs/etc/fstab ]; then
-    touch initramfs/etc/fstab
+    @FEBOOTSTRAP_RUN@ initramfs -- touch /etc/fstab
 fi
 
 # Copy the daemon into the filesystem.
 #cp daemon/guestfsd initramfs/sbin
 
 # Create the init script.
-cat > initramfs/init <<'__EOF__'
+cat > initramfs/init.new <<'__EOF__'
 #!/bin/sh
 PATH=/sbin:/usr/sbin:$PATH
 MAKEDEV mem null port zero core full ram tty console fd \
@@ -93,13 +96,14 @@ rpc.mountd
 __EOF__
 
 if [ "x$debug" != "xyes" ]; then
-    echo exec guestfsd -f >> initramfs/init
+    echo exec guestfsd -f >> initramfs/init.new
 else
-    echo guestfsd >> initramfs/init
-    echo exec bash -i >> initramfs/init
+    echo guestfsd >> initramfs/init.new
+    echo exec bash -i >> initramfs/init.new
 fi
 
-chmod +x initramfs/init
+@FEBOOTSTRAP_RUN@ initramfs -- install -m 0755 -o root -g root /init.new /init
+rm initramfs/init.new
 
 # Generate final image.
 @FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t
-- 
1.8.3.1