Attachment #308511 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/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

Return to bug 411559

Lines 635-641 startVolumes() { Link Here

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

Lines 260-271 append_lvm(){ Link Here

(-)a/gen_initramfs.sh (-3 / +3 lines)
260	compile_lvm	260	compile_lvm
261	/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" \|\|	261	/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" \|\|
262	gen_die "Could not extract lvm binary cache!";	262	gen_die "Could not extract lvm binary cache!";
263	mv ${TEMP}/initramfs-lvm-temp/sbin/lvm.static ${TEMP}/initramfs-lvm-temp/bin/lvm \|\|
264	gen_die 'LVM error: Could not move lvm.static to lvm!'
265	# See bug 382555	263	# See bug 382555
266	mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup \|\|	264	mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup \|\|
267	gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'	265	gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'
268	rm -rf ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}	266	rm -rf ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/dmsetup}
		267	mv ${TEMP}/initramfs-lvm-temp/sbin/lvm{.static,} \|\|
		268	gen_die 'LVM error: Could not move lvm.static to lvm!'
269	fi	269	fi
270	if [ -x /sbin/lvm ]	270	if [ -x /sbin/lvm ]
271	then	271	then