--- a/defaults/initrd.scripts	2012-04-16 20:31:52.000702168 +0300
+++ b/defaults/initrd.scripts	2012-04-16 20:32:36.842577817 +0300
@@ -625,7 +625,7 @@
 
 	if [ "${USE_LVM_NORMAL}" = '1' ]
 	then
-		if [ -e '/bin/lvm' ]
+		if [ -e '/sbin/lvm' ]
 		then
 			for dev in ${RAID_DEVICES}
 			do
@@ -633,7 +633,7 @@
 			done
 
 			# This is needed for /bin/lvm to accept the following logic
-			lvm_commands="#! /bin/lvm"
+			lvm_commands="#! /sbin/lvm"
 
 			# If there is a cahe, update it. Unbreak at least dmcrypt
 			[ -d /etc/lvm/cache ] && lvm_commands="${lvm_commands} \nvgscan"
@@ -648,7 +648,7 @@
 
 			# And finally execute it all (/proc/... needed if lvm is compiled without readline)
 			good_msg "Scanning for and activating Volume Groups"
-			printf "%b\n" "${lvm_commands}" | /bin/lvm /proc/self/fd/0
+			printf "%b\n" "${lvm_commands}" | /sbin/lvm /proc/self/fd/0
 		else
 			bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"
 		fi
--- a/gen_initramfs.sh	2012-04-16 05:11:05.000000000 +0300
+++ b/gen_initramfs.sh	2012-04-16 20:32:36.843577837 +0300
@@ -270,12 +270,12 @@
 		compile_lvm
 		/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" ||
 			gen_die "Could not extract lvm binary cache!";
-		mv ${TEMP}/initramfs-lvm-temp/sbin/lvm.static ${TEMP}/initramfs-lvm-temp/bin/lvm ||
-			gen_die 'LVM error: Could not move lvm.static to 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,sbin/dmsetup}
+		mv ${TEMP}/initramfs-lvm-temp/sbin/lvm{.static,} ||
+			gen_die 'LVM error: Could not move lvm.static to lvm!'
 	fi
 	if [ -x /sbin/lvm ]
 	then