Apply patch for Gentoo bug #276753 for new lvm.static binary

diff --git a/ChangeLog b/ChangeLog
index d4a7a667a9ec9aeeb8cda605eabd10edc238cdef..8b1716030d7f43d011b4ba5e4978c484e3a05d56 100644 (file)
--- 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 <agaffney@gentoo.org> gen_initramfs.sh:
+  Apply patch for Gentoo bug #276753 for new lvm.static binary
+
   07 Jul 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> genkernel:
   Version bumping to 3.4.10.905 for release.
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 111b6ccdc87ab2afc3db07dc26e5d46daab3539f..56e2be1642c98601dc46f8dadb182b055fda2a04 100755 (executable)
--- 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" ||