Handle other possible paths for LVM.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index 5de0effc8d5813205d040445333e50f76a1626ba..f75e034fec33e45d6bbc227980b0b22093424c47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  14 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
+  Handle other binary paths for LVM.
+
   09 Apr 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   defaults/keymaps/keymapList, defaults/keymaps/sf.map:
   Add keymap "sf" from Pentoo

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index f3c14c2c71ca09137a0db1d580d29711867fce92..f178b2d51f93e077972e355fdaa6d0a041b16cb1 100755 (executable)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -265,9 +265,9 @@ append_lvm(){
                # See bug 382555
                mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup ||
                        gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'
-               rm -rf  ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}
+               rm -rf  ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,{s,}bin/{lvm,dmsetup}}
        fi
-       if [ -x /sbin/lvm ]
+       if [ -x /sbin/lvm -o -x /bin/lvm ]
        then
 #              lvm dumpconfig 2>&1 > /dev/null || gen_die 'Could not copy over lvm.conf!'
 #              ret=$?