Put blkid of e2fsprogs into /sbin, not /bin (bug #352746)

diff --git a/ChangeLog b/ChangeLog
index 41181ef9198c997f573a78bf4b1c18db7ed0539f..4bdb245d79c029899890208995f46bf51c41d8e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  30 Jan 2011; Sebastian Pipping <sping@gentoo.org> 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 <sping@gentoo.org> genkernel:
   Bump version to 3.4.12.4
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 364655fdc2a20bf9a798b4f20d3f235b66429c92..582df2ccad0992c2d662dd0025895c65deb538e0 100755 (executable)
--- 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"