From: Robin H. Johnson <robbat2@gentoo.org>
Date: Sun, 15 Apr 2012 02:13:37 +0000 (+0000)
Subject: Handle other possible paths for LVM.
X-Git-Tag: v3.4.31~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f36ecc125bf2c20bd28c0ad513577a858140a77;p=genkernel.git

Handle other possible paths for LVM.

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

diff --git a/ChangeLog b/ChangeLog
index 5de0eff..f75e034 100644
--- 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 f3c14c2..f178b2d 100755
--- 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=$?