Attachment #351952 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 690-696 Link Here

(-)a/defaults/initrd.scripts (-3 / +3 lines)
690		690
691	if [ "${USE_LVM_NORMAL}" = '1' ]	691	if [ "${USE_LVM_NORMAL}" = '1' ]
692	then	692	then
693	if [ -e '/bin/lvm' ]	693	if [ -e '/sbin/lvm' ]
694	then	694	then
695	for dev in ${RAID_DEVICES}	695	for dev in ${RAID_DEVICES}
696	do	696	do
Lines 698-704 Link Here
698	done	698	done
699		699
700	# This is needed for /bin/lvm to accept the following logic	700	# This is needed for /bin/lvm to accept the following logic
701	lvm_commands="#! /bin/lvm"	701	lvm_commands="#! /sbin/lvm"
702		702
703	# If there is a cahe, update it. Unbreak at least dmcrypt	703	# If there is a cahe, update it. Unbreak at least dmcrypt
704	[ -d /etc/lvm/cache ] && lvm_commands="${lvm_commands} \nvgscan"	704	[ -d /etc/lvm/cache ] && lvm_commands="${lvm_commands} \nvgscan"
Lines 713-719 Link Here
713		713
714	# And finally execute it all (/proc/... needed if lvm is compiled without readline)	714	# And finally execute it all (/proc/... needed if lvm is compiled without readline)
715	good_msg "Scanning for and activating Volume Groups"	715	good_msg "Scanning for and activating Volume Groups"
716	printf "%b\n" "${lvm_commands}" \| /bin/lvm /proc/self/fd/0	716	printf "%b\n" "${lvm_commands}" \| /sbin/lvm /proc/self/fd/0
717	else	717	else
718	bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"	718	bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"
719	fi	719	fi

Lines 347-358 Link Here

(-)a/gen_initramfs.sh (-2 / +2 lines)
347	compile_lvm	347	compile_lvm
348	/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" \|\|	348	/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" \|\|
349	gen_die "Could not extract lvm binary cache!";	349	gen_die "Could not extract lvm binary cache!";
350	mv ${TEMP}/initramfs-lvm-temp/sbin/lvm.static ${TEMP}/initramfs-lvm-temp/bin/lvm \|\|
351	gen_die 'LVM error: Could not move lvm.static to lvm!'
352	# See bug 382555	350	# See bug 382555
353	mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup \|\|	351	mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup \|\|
354	gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'	352	gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'
355	rm -rf ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}	353	rm -rf ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}
		354	mv ${TEMP}/initramfs-lvm-temp/sbin/lvm{.static,} \|\|
		355	gen_die 'LVM error: Could not move lvm.static to lvm!'
356	fi	356	fi
357	if [ -x /sbin/lvm -o -x /bin/lvm ]	357	if [ -x /sbin/lvm -o -x /bin/lvm ]
358	then	358	then