From: Andrew Gaffney Date: Sun, 12 Jul 2009 16:31:57 +0000 (-0500) Subject: Apply patch for Gentoo bug #276753 for new lvm.static binary X-Git-Tag: v3.4.10.906~12 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=229d8ef4f123e481bccdb2edcd5297d52cdfb092;p=genkernel.git Apply patch for Gentoo bug #276753 for new lvm.static binary --- diff --git a/ChangeLog b/ChangeLog index d4a7a66..8b17160 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for genkernel -# Copyright 2003-2008 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) +# Copyright 1999-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 + 12 Jul 2009; Andrew Gaffney gen_initramfs.sh: + Apply patch for Gentoo bug #276753 for new lvm.static binary + 07 Jul 2009; Chris Gianelloni genkernel: Version bumping to 3.4.10.905 for release. diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 111b6cc..56e2be1 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -200,7 +200,12 @@ append_lvm(){ cd ${TEMP} mkdir -p "${TEMP}/initramfs-lvm-temp/bin/" mkdir -p "${TEMP}/initramfs-lvm-temp/etc/lvm/" - if [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable' + if [ -e '/sbin/lvm.static' ] + then + print_info 1 ' LVM: Adding support (using local static binaries)...' + cp /sbin/lvm.static "${TEMP}/initramfs-lvm-temp/bin/lvm" || + gen_die 'Could not copy over lvm!' + elif [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable' then print_info 1 ' LVM: Adding support (using local static binaries)...' cp /sbin/lvm "${TEMP}/initramfs-lvm-temp/bin/lvm" ||