From 81e41d541d2d9acbf8b3f9ab1c51fbe6a6d19942 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sun, 30 Jan 2011 19:36:08 +0100 Subject: [PATCH] Put blkid of e2fsprogs into /sbin, not /bin (bug #352746) --- ChangeLog | 4 ++++ gen_initramfs.sh | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41181ef..4bdb245 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ + 30 Jan 2011; Sebastian Pipping gen_initramfs.sh: + Give blkid of e2fsprogs precedence over busybox re-write by putting it into + /sbin, not /bin (bug #352746) + 30 Jan 2011; Sebastian Pipping genkernel: Bump version to 3.4.12.4 diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 364655f..582df2c 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -75,10 +75,10 @@ append_blkid(){ rm -r "${TEMP}/initramfs-blkid-temp/" fi cd ${TEMP} - mkdir -p "${TEMP}/initramfs-blkid-temp/bin/" - [ "${DISKLABEL}" = '1' ] && { /bin/bzip2 -dc "${BLKID_BINCACHE}" > "${TEMP}/initramfs-blkid-temp/bin/blkid" || + mkdir -p "${TEMP}/initramfs-blkid-temp/sbin/" + [ "${DISKLABEL}" = '1' ] && { /bin/bzip2 -dc "${BLKID_BINCACHE}" > "${TEMP}/initramfs-blkid-temp/sbin/blkid" || gen_die "Could not extract blkid binary cache!"; } - chmod a+x "${TEMP}/initramfs-blkid-temp/bin/blkid" + chmod a+x "${TEMP}/initramfs-blkid-temp/sbin/blkid" cd "${TEMP}/initramfs-blkid-temp/" find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing blkid cpio" -- 2.26.2