Attachment #319744 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 632-638 Link Here

(-)a/defaults/initrd.scripts (-3 / +3 lines)
632		632
633	if [ "${USE_LVM_NORMAL}" = '1' ]	633	if [ "${USE_LVM_NORMAL}" = '1' ]
634	then	634	then
635	if [ -e '/bin/lvm' ]	635	if [ -e '/sbin/lvm' ]
636	then	636	then
637	for dev in ${RAID_DEVICES}	637	for dev in ${RAID_DEVICES}
638	do	638	do
Lines 640-646 Link Here
640	done	640	done
641		641
642	# This is needed for /bin/lvm to accept the following logic	642	# This is needed for /bin/lvm to accept the following logic
643	lvm_commands="#! /bin/lvm"	643	lvm_commands="#! /sbin/lvm"
644		644
645	# If there is a cahe, update it. Unbreak at least dmcrypt	645	# If there is a cahe, update it. Unbreak at least dmcrypt
646	[ -d /etc/lvm/cache ] && lvm_commands="${lvm_commands} \nvgscan"	646	[ -d /etc/lvm/cache ] && lvm_commands="${lvm_commands} \nvgscan"
Lines 655-661 Link Here
655		655
656	# And finally execute it all (/proc/... needed if lvm is compiled without readline)	656	# And finally execute it all (/proc/... needed if lvm is compiled without readline)
657	good_msg "Scanning for and activating Volume Groups"	657	good_msg "Scanning for and activating Volume Groups"
658	printf "%b\n" "${lvm_commands}" \| /bin/lvm /proc/self/fd/0	658	printf "%b\n" "${lvm_commands}" \| /sbin/lvm /proc/self/fd/0
659	else	659	else
660	bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"	660	bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"
661	fi	661	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