[patch] genkernel kernel initramfs static lvm inside /sbin

genkernel-3.4.36_lvm_sbin.patch (text/plain), 1.88 KB, created by Sebastian Glita on 2012-06-14 16:33:04 UTC

diff -urN a/defaults/initrd.scripts b/defaults/initrd.scripts
--- a/defaults/initrd.scripts	2012-06-05 15:57:41.814745668 +0300
+++ b/defaults/initrd.scripts	2012-06-05 15:58:08.698273434 +0300
@@ -623,7 +623,7 @@
 
 	if [ "${USE_LVM_NORMAL}" = '1' ]
 	then
-		if [ -e '/bin/lvm' ]
+		if [ -e '/sbin/lvm' ]
 		then
 			for dev in ${RAID_DEVICES}
 			do
@@ -631,7 +631,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"
@@ -646,7 +646,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
diff -urN a/gen_initramfs.sh b/gen_initramfs.sh
--- a/gen_initramfs.sh	2012-06-04 22:58:07.000000000 +0300
+++ b/gen_initramfs.sh	2012-06-05 16:01:30.358233637 +0300
@@ -306,12 +306,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}}
+		mv ${TEMP}/initramfs-lvm-temp/sbin/lvm{.static,} ||
+			gen_die 'LVM error: Could not move lvm.static to lvm!'
 	fi
 	if [ -x /sbin/lvm -o -x /bin/lvm ]
 	then