View | Details | Raw Unified
Collapse All | Expand All

(-) genkernel-3.4.7.orig/gen_initramfs.sh (-8 / +8 lines)
 Lines 208-214    Link Here 
	cd ${TEMP}
	cd ${TEMP}
	mkdir -p "${TEMP}/initramfs-lvm2-temp/bin/"
	mkdir -p "${TEMP}/initramfs-lvm2-temp/bin/"
	mkdir -p "${TEMP}/initramfs-lvm2-temp/etc/lvm/"
	mkdir -p "${TEMP}/initramfs-lvm2-temp/etc/lvm/"
	if [ -e '/sbin/lvm' ] && ldd /sbin/lvm|grep -q 'not a dynamic executable'
	if [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable'
	then
	then
		print_info 1 '		LVM2: Adding support (using local static binaries)...'
		print_info 1 '		LVM2: Adding support (using local static binaries)...'
		cp /sbin/lvm "${TEMP}/initramfs-lvm2-temp/bin/lvm" ||
		cp /sbin/lvm "${TEMP}/initramfs-lvm2-temp/bin/lvm" ||
 Lines 223-237    Link Here 
	fi
	fi
	if [ -x /sbin/lvm ]
	if [ -x /sbin/lvm ]
	then
	then
		lvm dumpconfig 2>&1 > /dev/null || gen_die 'Could not copy over lvm.conf!'
#		lvm dumpconfig 2>&1 > /dev/null || gen_die 'Could not copy over lvm.conf!'
		ret=$?
#		ret=$?
		if [ ${ret} != 0 ]
#		if [ ${ret} != 0 ]
		then
#		then
			cp /etc/lvm/lvm.conf "${TEMP}/initramfs-lvm2-temp/etc/lvm/" ||
			cp /etc/lvm/lvm.conf "${TEMP}/initramfs-lvm2-temp/etc/lvm/" ||
				gen_die 'Could not copy over lvm.conf!'
				gen_die 'Could not copy over lvm.conf!'
		else
#		else
			gen_die 'Could not copy over lvm.conf!'
#			gen_die 'Could not copy over lvm.conf!'
		fi
#		fi
	fi
	fi
	cd "${TEMP}/initramfs-lvm2-temp/"
	cd "${TEMP}/initramfs-lvm2-temp/"
	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
(-) genkernel-3.4.7.orig/gen_initrd.sh (-8 / +8 lines)
 Lines 168-174    Link Here 
	# LVM2
	# LVM2
	if [ "${LVM2}" = '1' ]
	if [ "${LVM2}" = '1' ]
	then
	then
		if [ -e '/sbin/lvm' ] && ldd /sbin/lvm|grep -q 'not a dynamic executable';
		if [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable';
		then
		then
			print_info 1 'LVM2: Adding support (using local static binaries)...'
			print_info 1 'LVM2: Adding support (using local static binaries)...'
			cp /sbin/lvm "${TEMP}/initrd-temp/bin/lvm" ||
			cp /sbin/lvm "${TEMP}/initrd-temp/bin/lvm" ||
 Lines 189-203    Link Here 
		mkdir -p ${TEMP}/initrd-temp/etc/lvm
		mkdir -p ${TEMP}/initrd-temp/etc/lvm
		if [ -x /sbin/lvm ]
		if [ -x /sbin/lvm ]
		then
		then
			lvm dumpconfig 2>&1 > /dev/null || gen_die 'Could not copy over lvm.conf!'
#			lvm dumpconfig 2>&1 > /dev/null || gen_die 'Could not copy over lvm.conf!'
			ret=$?
#			ret=$?
			if [ ${ret} != 0 ]
#			if [ ${ret} != 0 ]
			then
#			then
				cp /etc/lvm/lvm.conf "${TEMP}/initramfs-lvm2-temp/etc/lvm/" ||
				cp /etc/lvm/lvm.conf "${TEMP}/initramfs-lvm2-temp/etc/lvm/" ||
					gen_die 'Could not copy over lvm.conf!'
					gen_die 'Could not copy over lvm.conf!'
			else
#			else
				gen_die 'Could not copy over lvm.conf!'
#				gen_die 'Could not copy over lvm.conf!'
			fi
#			fi
		fi
		fi
	fi
	fi