From b116df3c9874f875933aee8a1e086b2b02ce46e3 Mon Sep 17 00:00:00 2001 From: agaffney Date: Thu, 13 Nov 2008 10:29:59 -0600 Subject: [PATCH] Make sure that /sbin/unionfs is +x --- ChangeLog | 4 ++++ defaults/linuxrc | 2 +- gen_initramfs.sh | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 371a73a..4abdf69 100644 --- 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 defaults/linuxrc, + gen_initramfs.sh: + Make sure that /sbin/unionfs is +x + 13 Nov 2008; Andrew Gaffney 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 f5e6ef1..c38c907 100644 --- 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 0bd9e21..1773b39 100644 --- 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 -- 2.26.2