Attachment #314303 for bug #411559

View | Details | Raw Unified | Return to bug 411559 | Differences between

and this patch





	if [ "${USE_LVM_NORMAL}" = '1' ]
	then
		if [ -e '/sbin/lvm' ]
		then
			for dev in ${RAID_DEVICES}
			do

			done

			# This is needed for /bin/lvm to accept the following logic
			lvm_commands="#! /sbin/lvm"

			# If there is a cahe, update it. Unbreak at least dmcrypt
			[ -d /etc/lvm/cache ] && lvm_commands="${lvm_commands} \nvgscan"


			# 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}" | /sbin/lvm /proc/self/fd/0
		else
			bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"
		fi




		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

Return to bug 411559

Lines 623-629 Link Here

(-)a/defaults/initrd.scripts (-3 / +3 lines)
623		623
624	if [ "${USE_LVM_NORMAL}" = '1' ]	624	if [ "${USE_LVM_NORMAL}" = '1' ]
625	then	625	then
626	if [ -e '/bin/lvm' ]	626	if [ -e '/sbin/lvm' ]
627	then	627	then
628	for dev in ${RAID_DEVICES}	628	for dev in ${RAID_DEVICES}
629	do	629	do
Lines 631-637 Link Here
631	done	631	done
632		632
633	# This is needed for /bin/lvm to accept the following logic	633	# This is needed for /bin/lvm to accept the following logic
634	lvm_commands="#! /bin/lvm"	634	lvm_commands="#! /sbin/lvm"
635		635
636	# If there is a cahe, update it. Unbreak at least dmcrypt	636	# If there is a cahe, update it. Unbreak at least dmcrypt
637	[ -d /etc/lvm/cache ] && lvm_commands="${lvm_commands} \nvgscan"	637	[ -d /etc/lvm/cache ] && lvm_commands="${lvm_commands} \nvgscan"
Lines 646-652 Link Here
646		646
647	# And finally execute it all (/proc/... needed if lvm is compiled without readline)	647	# And finally execute it all (/proc/... needed if lvm is compiled without readline)
648	good_msg "Scanning for and activating Volume Groups"	648	good_msg "Scanning for and activating Volume Groups"
649	printf "%b\n" "${lvm_commands}" \| /bin/lvm /proc/self/fd/0	649	printf "%b\n" "${lvm_commands}" \| /sbin/lvm /proc/self/fd/0
650	else	650	else
651	bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"	651	bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"
652	fi	652	fi

Lines 306-317 Link Here

(-)a/gen_initramfs.sh (-2 / +2 lines)
306	compile_lvm	306	compile_lvm
307	/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" \|\|	307	/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" \|\|
308	gen_die "Could not extract lvm binary cache!";	308	gen_die "Could not extract lvm binary cache!";
309	mv ${TEMP}/initramfs-lvm-temp/sbin/lvm.static ${TEMP}/initramfs-lvm-temp/bin/lvm \|\|
310	gen_die 'LVM error: Could not move lvm.static to lvm!'
311	# See bug 382555	309	# See bug 382555
312	mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup \|\|	310	mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup \|\|
313	gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'	311	gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'
314	rm -rf ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}	312	rm -rf ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}
		313	mv ${TEMP}/initramfs-lvm-temp/sbin/lvm{.static,} \|\|
		314	gen_die 'LVM error: Could not move lvm.static to lvm!'
315	fi	315	fi
316	if [ -x /sbin/lvm -o -x /bin/lvm ]	316	if [ -x /sbin/lvm -o -x /bin/lvm ]
317	then	317	then