Attachment #258228 for bug #282100

Lines 608-616 startVolumes() { Link Here

(-)a/defaults/initrd.scripts (-2 / +3 lines)
608	then	608	then
609	if [ ! -e '/etc/mdadm.conf' ]	609	if [ ! -e '/etc/mdadm.conf' ]
610	then	610	then
611	/sbin/mdadm --examine > /etc/mdadm.conf	611	echo "DEVICE /dev/sd[a-z]* /dev/hd[a-z]*" >/etc/mdadm.conf
		612	/sbin/mdadm --examine --scan >>/etc/mdadm.conf
612	fi	613	fi
613	/sbin/mdadm --assemble	614	/sbin/mdadm -A --scan
614	fi	615	fi
615		616
616	if [ "${USE_DMRAID_NORMAL}" = '1' ]	617	if [ "${USE_DMRAID_NORMAL}" = '1' ]




	fi
}

compile_mdadm() {
	if [ ! -f "${MDADM_BINCACHE}" ]
	then
		[ -f "${MDADM_SRCTAR}" ] ||
			gen_die "Could not find MDADM source tarball: ${MDADM_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
		cd "${TEMP}"
		rm -rf "${MDADM_DIR}" > /dev/null
		/bin/tar -jxpf "${MDADM_SRCTAR}" ||
			gen_die 'Could not extract MDADM source tarball!'
		[ -d "${MDADM_DIR}" ] ||
			gen_die 'MDADM directory ${MDADM_DIR} is invalid!'
		
		cd "${MDADM_DIR}"
		sed -i "/^CFLAGS = /s:^CFLAGS = \(.*\)$:CFLAGS = -Os:" Makefile
		sed -i "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = -Os:" Makefile
		sed -i "/^CWFLAGS = /s:^CWFLAGS = \(.*\)$:CWFLAGS = -Wall:" Makefile
		sed -i "s/^# LDFLAGS = -static/LDFLAGS = -static/" Makefile

		print_info 1 'mdadm: >> Compiling...'
			compile_generic 'mdadm mdmon' utils

		mkdir -p "${TEMP}/mdadm/sbin"
		install -m 0755 -s mdadm "${TEMP}/mdadm/sbin/mdadm"
		install -m 0755 -s mdmon "${TEMP}/mdadm/sbin/mdmon"
		print_info 1 '      >> Copying to bincache...'
		cd "${TEMP}/mdadm"
		strip "sbin/mdadm" "sbin/mdmon" ||
			gen_die 'Could not strip mdadm binaries!'
		/bin/tar -cjf "${MDADM_BINCACHE}" sbin/mdadm sbin/mdmon ||
			gen_die 'Could not create binary cache'

		cd "${TEMP}"
		rm -rf "${MDADM_DIR}" mdadm
	fi
}

compile_dmraid() {
	compile_device_mapper
	if [ ! -f "${DMRAID_BINCACHE}" ]




	fi
	cd ${TEMP}
	mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/"
	mkdir -p "${TEMP}/initramfs-mdadm-temp/sbin/"
	if [ "${MDADM}" -eq '1' ]
	then
		cp -a /etc/mdadm.conf "${TEMP}/initramfs-mdadm-temp/etc" \
			|| gen_die "Could not copy mdadm.conf!"
		if [ -e '/sbin/mdadm' ] && LC_ALL="C" ldd /sbin/mdadm|grep -q 'not a dynamic executable'
		then
			print_info 1 '		MDADM: Adding support (using local static binaries)...'
			cp /sbin/mdadm "${TEMP}/initramfs-mdadm-temp/sbin/mdadm" ||
				gen_die 'Could not copy over mdadm!'
		else
			print_info 1 '		MDADM: Adding support (compiling binaries)...'
			compile_mdadm
			/bin/tar -jxpf "${MDADM_BINCACHE}" -C "${TEMP}/initramfs-mdadm-temp" ||
				gen_die "Could not extract mdadm binary cache!";
		fi
	fi
	cd "${TEMP}/initramfs-mdadm-temp/"
	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"

Lines 162-167 LVM_DIR="LVM2.${LVM_VER}" Link Here

(-)a/genkernel.conf (-1 / +5 lines)
162	LVM_SRCTAR="${DISTDIR}/LVM2.${LVM_VER}.tgz"	162	LVM_SRCTAR="${DISTDIR}/LVM2.${LVM_VER}.tgz"
163	LVM_BINCACHE="%%CACHE%%/LVM2.${LVM_VER}-%%ARCH%%.tar.bz2"	163	LVM_BINCACHE="%%CACHE%%/LVM2.${LVM_VER}-%%ARCH%%.tar.bz2"
164		164
		165	MDADM_VER="VERSION_MDADM"
		166	MDADM_DIR="mdadm-${MDADM_VER}"
		167	MDADM_SRCTAR="${DISTDIR}/mdadm-${MDADM_VER}.tar.bz2"
		168	MDADM_BINCACHE="%%CACHE%%/mdadm-${MDADM_VER}-%%ARCH%%.tar.bz2"
		169
165	DMRAID_VER="VERSION_DMRAID"	170	DMRAID_VER="VERSION_DMRAID"
166	DMRAID_DIR="dmraid/${DMRAID_VER}"	171	DMRAID_DIR="dmraid/${DMRAID_VER}"
167	DMRAID_SRCTAR="${DISTDIR}/dmraid-${DMRAID_VER}.tar.bz2"	172	DMRAID_SRCTAR="${DISTDIR}/dmraid-${DMRAID_VER}.tar.bz2"
168	-

Return to bug 282100

Lines 444-449 compile_lvm() { Link Here

(-)a/gen_compile.sh (+36 lines)
444	fi	444	fi
445	}	445	}
446		446
		447	compile_mdadm() {
		448	if [ ! -f "${MDADM_BINCACHE}" ]
		449	then
		450	[ -f "${MDADM_SRCTAR}" ] \|\|
		451	gen_die "Could not find MDADM source tarball: ${MDADM_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
		452	cd "${TEMP}"
		453	rm -rf "${MDADM_DIR}" > /dev/null
		454	/bin/tar -jxpf "${MDADM_SRCTAR}" \|\|
		455	gen_die 'Could not extract MDADM source tarball!'
		456	[ -d "${MDADM_DIR}" ] \|\|
		457	gen_die 'MDADM directory ${MDADM_DIR} is invalid!'
		458
		459	cd "${MDADM_DIR}"
		460	sed -i "/^CFLAGS = /s:^CFLAGS = \(.*\)$:CFLAGS = -Os:" Makefile
		461	sed -i "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = -Os:" Makefile
		462	sed -i "/^CWFLAGS = /s:^CWFLAGS = \(.*\)$:CWFLAGS = -Wall:" Makefile
		463	sed -i "s/^# LDFLAGS = -static/LDFLAGS = -static/" Makefile
		464
		465	print_info 1 'mdadm: >> Compiling...'
		466	compile_generic 'mdadm mdmon' utils
		467
		468	mkdir -p "${TEMP}/mdadm/sbin"
		469	install -m 0755 -s mdadm "${TEMP}/mdadm/sbin/mdadm"
		470	install -m 0755 -s mdmon "${TEMP}/mdadm/sbin/mdmon"
		471	print_info 1 ' >> Copying to bincache...'
		472	cd "${TEMP}/mdadm"
		473	strip "sbin/mdadm" "sbin/mdmon" \|\|
		474	gen_die 'Could not strip mdadm binaries!'
		475	/bin/tar -cjf "${MDADM_BINCACHE}" sbin/mdadm sbin/mdmon \|\|
		476	gen_die 'Could not create binary cache'
		477
		478	cd "${TEMP}"
		479	rm -rf "${MDADM_DIR}" mdadm
		480	fi
		481	}
		482
447	compile_dmraid() {	483	compile_dmraid() {
448	compile_device_mapper	484	compile_device_mapper
449	if [ ! -f "${DMRAID_BINCACHE}" ]	485	if [ ! -f "${DMRAID_BINCACHE}" ]

Lines 328-337 append_mdadm(){ Link Here

(-)a/gen_initramfs.sh (+12 lines)
328	fi	328	fi
329	cd ${TEMP}	329	cd ${TEMP}
330	mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/"	330	mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/"
		331	mkdir -p "${TEMP}/initramfs-mdadm-temp/sbin/"
331	if [ "${MDADM}" -eq '1' ]	332	if [ "${MDADM}" -eq '1' ]
332	then	333	then
333	cp -a /etc/mdadm.conf "${TEMP}/initramfs-mdadm-temp/etc" \	334	cp -a /etc/mdadm.conf "${TEMP}/initramfs-mdadm-temp/etc" \
334	\|\| gen_die "Could not copy mdadm.conf!"	335	\|\| gen_die "Could not copy mdadm.conf!"
		336	if [ -e '/sbin/mdadm' ] && LC_ALL="C" ldd /sbin/mdadm\|grep -q 'not a dynamic executable'
		337	then
		338	print_info 1 ' MDADM: Adding support (using local static binaries)...'
		339	cp /sbin/mdadm "${TEMP}/initramfs-mdadm-temp/sbin/mdadm" \|\|
		340	gen_die 'Could not copy over mdadm!'
		341	else
		342	print_info 1 ' MDADM: Adding support (compiling binaries)...'
		343	compile_mdadm
		344	/bin/tar -jxpf "${MDADM_BINCACHE}" -C "${TEMP}/initramfs-mdadm-temp" \|\|
		345	gen_die "Could not extract mdadm binary cache!";
		346	fi
335	fi	347	fi
336	cd "${TEMP}/initramfs-mdadm-temp/"	348	cd "${TEMP}/initramfs-mdadm-temp/"
337	find . -print \| cpio ${CPIO_ARGS} --append -F "${CPIO}"	349	find . -print \| cpio ${CPIO_ARGS} --append -F "${CPIO}"

Lines 128-133 determine_real_args() { Link Here

(-)a/gen_determineargs.sh (+2 lines)
128	BUSYBOX_BINCACHE=`cache_replace "${BUSYBOX_BINCACHE}"`	128	BUSYBOX_BINCACHE=`cache_replace "${BUSYBOX_BINCACHE}"`
129	DEVICE_MAPPER_BINCACHE=`cache_replace "${DEVICE_MAPPER_BINCACHE}"`	129	DEVICE_MAPPER_BINCACHE=`cache_replace "${DEVICE_MAPPER_BINCACHE}"`
130	LVM_BINCACHE=`cache_replace "${LVM_BINCACHE}"`	130	LVM_BINCACHE=`cache_replace "${LVM_BINCACHE}"`
		131	MDADM_BINCACHE=`cache_replace "${MDADM_BINCACHE}"`
131	DMRAID_BINCACHE=`cache_replace "${DMRAID_BINCACHE}"`	132	DMRAID_BINCACHE=`cache_replace "${DMRAID_BINCACHE}"`
132	ISCSI_BINCACHE=`cache_replace "${ISCSI_BINCACHE}"`	133	ISCSI_BINCACHE=`cache_replace "${ISCSI_BINCACHE}"`
133	BLKID_BINCACHE=`cache_replace "${BLKID_BINCACHE}"`	134	BLKID_BINCACHE=`cache_replace "${BLKID_BINCACHE}"`
Lines 139-144 determine_real_args() { Link Here
139	BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"`	140	BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"`
140	DEVICE_MAPPER_BINCACHE=`arch_replace "${DEVICE_MAPPER_BINCACHE}"`	141	DEVICE_MAPPER_BINCACHE=`arch_replace "${DEVICE_MAPPER_BINCACHE}"`
141	LVM_BINCACHE=`arch_replace "${LVM_BINCACHE}"`	142	LVM_BINCACHE=`arch_replace "${LVM_BINCACHE}"`
		143	MDADM_BINCACHE=`arch_replace "${MDADM_BINCACHE}"`
142	DMRAID_BINCACHE=`arch_replace "${DMRAID_BINCACHE}"`	144	DMRAID_BINCACHE=`arch_replace "${DMRAID_BINCACHE}"`
143	ISCSI_BINCACHE=`arch_replace "${ISCSI_BINCACHE}"`	145	ISCSI_BINCACHE=`arch_replace "${ISCSI_BINCACHE}"`
144	BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"`	146	BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"`