Attachment #309183 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 625-631 Link Here

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

Lines 270-281 Link Here

(-)a/gen_initramfs.sh (-3 / +3 lines)
270	compile_lvm	270	compile_lvm
271	/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" \|\|	271	/bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" \|\|
272	gen_die "Could not extract lvm binary cache!";	272	gen_die "Could not extract lvm binary cache!";
273	mv ${TEMP}/initramfs-lvm-temp/sbin/lvm.static ${TEMP}/initramfs-lvm-temp/bin/lvm \|\|
274	gen_die 'LVM error: Could not move lvm.static to lvm!'
275	# See bug 382555	273	# See bug 382555
276	mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup \|\|	274	mv ${TEMP}/initramfs-lvm-temp/sbin/dmsetup.static ${TEMP}/initramfs-lvm-temp/bin/dmsetup \|\|
277	gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'	275	gen_die 'LVM error: Could not move dmsetup.static to dmsetup!'
278	rm -rf ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/{lvm,dmsetup}}	276	rm -rf ${TEMP}/initramfs-lvm-temp/{lib,share,man,include,sbin/dmsetup}
		277	mv ${TEMP}/initramfs-lvm-temp/sbin/lvm{.static,} \|\|
		278	gen_die 'LVM error: Could not move lvm.static to lvm!'
279	fi	279	fi
280	if [ -x /sbin/lvm ]	280	if [ -x /sbin/lvm ]
281	then	281	then