Make sure that /sbin/unionfs is +x

diff --git a/ChangeLog b/ChangeLog
index 371a73aa65521c647e9117ee8cb17832f4495499..4abdf69f9ae955f3343e9f81e98f8f49e68823a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> defaults/linuxrc,
+  gen_initramfs.sh:
+  Make sure that /sbin/unionfs is +x
+
   13 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh,
   gen_initramfs.sh:
   Correct unionfs-fuse bincache path and clean up debugging code

diff --git a/defaults/linuxrc b/defaults/linuxrc
index f5e6ef1735654b3ededdc6653c6d7c5c53b16247..c38c9070d41c43baa8a73c5ce5b32ac1a717b1ac 100644 (file)
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -187,7 +187,7 @@ do
                        if [ ! -x /sbin/unionfs ]
                        then
                                USE_UNIONFS_NORMAL=0
-                               bad_msg 'Unionctl not found: aborting use of unionfs!'
+                               bad_msg 'unionfs binary not found: aborting use of unionfs!'
                        else
                                USE_UNIONFS_NORMAL=1
                        fi

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 0bd9e2105b6d3dce68eb0c4646a514d5a878a0d2..1773b39dc6fa6ef78f189357e57f5c8c32869c7d 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -94,6 +94,7 @@ append_unionfs_fuse() {
        mkdir -p "${TEMP}/initramfs-unionfs-fuse-temp/sbin/"
        bzip2 -dc "${UNIONFS_FUSE_BINCACHE}" > "${TEMP}/initramfs-unionfs-fuse-temp/sbin/unionfs" ||
                gen_die 'Could not extract unionfs-fuse binary cache!'
+       chmod a+x "${TEMP}/initramfs-unionfs-fuse-temp/sbin/unionfs"
        cd "${TEMP}/initramfs-unionfs-fuse-temp/"
        find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
        rm -rf "${TEMP}/initramfs-unionfs-fuse-temp" > /dev/null