Attachment #132596 for bug #172128

Lines 81-86 Link Here

(-)gen_cmdline.sh (+5 lines)
81	echo " first"	81	echo " first"
82	echo " --lvm Include LVM support"	82	echo " --lvm Include LVM support"
83	echo " --lvm2 Include LVM support"	83	echo " --lvm2 Include LVM support"
		84	echo " --mdadm Copy /etc/mdadm.conf to initramfs"
84	echo " --dmraid Include DMRAID support"	85	echo " --dmraid Include DMRAID support"
85	echo " --slowusb Enables extra pauses for slow USB CD boots"	86	echo " --slowusb Enables extra pauses for slow USB CD boots"
86	echo " --bootloader=grub Add new kernel to GRUB configuration"	87	echo " --bootloader=grub Add new kernel to GRUB configuration"
Lines 229-234 Link Here
229	echo	230	echo
230	print_warning 1 "Please use --lvm, as --lvm2 is deprecated."	231	print_warning 1 "Please use --lvm, as --lvm2 is deprecated."
231	;;	232	;;
		233	--mdadm)
		234	CMD_MDADM=1
		235	print_info 2 "CMD_MDADM: $CMD_MDADM"
		236	;;
232	--no-busybox)	237	--no-busybox)
233	CMD_NO_BUSYBOX=1	238	CMD_NO_BUSYBOX=1
234	print_info 2 "CMD_NO_BUSYBOX: ${CMD_NO_BUSYBOX}"	239	print_info 2 "CMD_NO_BUSYBOX: ${CMD_NO_BUSYBOX}"

Lines 376-381 Link Here

(-)x86/busy-config (+1 lines)
376	# CONFIG_IPCRM is not set	376	# CONFIG_IPCRM is not set
377	# CONFIG_IPCS is not set	377	# CONFIG_IPCS is not set
378	CONFIG_LOSETUP=y	378	CONFIG_LOSETUP=y
		379	CONFIG_MDADM=y
379	CONFIG_MDEV=y	380	CONFIG_MDEV=y
380	# CONFIG_FEATURE_MDEV_CONF is not set	381	# CONFIG_FEATURE_MDEV_CONF is not set
381	CONFIG_MDSTART=y	382	CONFIG_MDSTART=y

Lines 412-417 Link Here

(-)gen_determineargs.sh (+7 lines)
412	DMRAID=0	412	DMRAID=0
413	fi	413	fi
414		414
		415	if isTrue "${CMD_MDADM}"
		416	then
		417	MDADM=1
		418	else
		419	MDADM=0
		420	fi
		421
415	get_KV	422	get_KV
416	UNIONFS_MODULES_BINCACHE=`kv_replace "${UNIONFS_MODULES_BINCACHE}"`	423	UNIONFS_MODULES_BINCACHE=`kv_replace "${UNIONFS_MODULES_BINCACHE}"`
417	}	424	}




	rm -r "${TEMP}/initramfs-evms-temp/"
}

append_mdadm(){
	if [ -d "${TEMP}/initramfs-mdadm-temp" ]
	then
		rm -r "${TEMP}/initramfs-mdadm-temp/"
	fi
	cd ${TEMP}
	mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/"
	if [ "${MDADM}" -eq '1' ]
		cp -a /etc/mdadm.conf "${TEMP}/initramfs-udev-temp/etc" \
			|| gen_die "Could not copy mdadm.conf!"; }
	then
	fi
	cd "${TEMP}/initramfs-mdadm-temp/"
	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
	rm -rf "${TEMP}/initramfs-mdadm-temp" > /dev/null
}

append_splash(){
	if [ -x /usr/bin/splash_geninitramfs ] || [ -x /sbin/splash_geninitramfs ]
	then

	append_data 'lvm' "${LVM}"
	append_data 'dmraid' "${DMRAID}"
	append_data 'evms' "${EVMS}"
	append_data 'mdadm' "${MDADM}"
	
	if [ "${NOINITRDMODULES}" = '' ]
	then

Lines 602-607 Link Here

(-)generic/initrd.scripts (+9 lines)
602	ln -sf /dev/device-mapper /dev/mapper/control	602	ln -sf /dev/device-mapper /dev/mapper/control
603	fi	603	fi
604		604
		605	if [ "${USE_MDADM}" -eq '1' ]
		606	then
		607	if [ ! -e '/etc/mdadm.conf' ]
		608	then
		609	/sbin/mdadm --examine > /etc/mdadm.conf
		610	fi
		611	/sbin/mdadm --assemble
		612	fi
		613
605	if [ "${USE_DMRAID_NORMAL}" -eq '1' ]	614	if [ "${USE_DMRAID_NORMAL}" -eq '1' ]
606	then	615	then
607	if [ -e '/sbin/dmraid' ]	616	if [ -e '/sbin/dmraid' ]

Lines 108-113 Link Here

(-)generic/linuxrc (+3 lines)
108	dolvm)	108	dolvm)
109	USE_LVM_NORMAL=1	109	USE_LVM_NORMAL=1
110	;;	110	;;
		111	domdadm)
		112	USE_MDADM=1
		113	;;
111	dodmraid)	114	dodmraid)
112	USE_DMRAID_NORMAL=1	115	USE_DMRAID_NORMAL=1
113	;;	116	;;

Return to bug 172128

Lines 226-231 Link Here

(-)gen_initramfs.sh (+18 lines)
226	rm -r "${TEMP}/initramfs-evms-temp/"	226	rm -r "${TEMP}/initramfs-evms-temp/"
227	}	227	}
228		228
		229	append_mdadm(){
		230	if [ -d "${TEMP}/initramfs-mdadm-temp" ]
		231	then
		232	rm -r "${TEMP}/initramfs-mdadm-temp/"
		233	fi
		234	cd ${TEMP}
		235	mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/"
		236	if [ "${MDADM}" -eq '1' ]
		237	cp -a /etc/mdadm.conf "${TEMP}/initramfs-udev-temp/etc" \
		238	\|\| gen_die "Could not copy mdadm.conf!"; }
		239	then
		240	fi
		241	cd "${TEMP}/initramfs-mdadm-temp/"
		242	find . -print \| cpio ${CPIO_ARGS} --append -F "${CPIO}"
		243	rm -rf "${TEMP}/initramfs-mdadm-temp" > /dev/null
		244	}
		245
229	append_splash(){	246	append_splash(){
230	if [ -x /usr/bin/splash_geninitramfs ] \|\| [ -x /sbin/splash_geninitramfs ]	247	if [ -x /usr/bin/splash_geninitramfs ] \|\| [ -x /sbin/splash_geninitramfs ]
231	then	248	then
Lines 437-442 Link Here
437	append_data 'lvm' "${LVM}"	454	append_data 'lvm' "${LVM}"
438	append_data 'dmraid' "${DMRAID}"	455	append_data 'dmraid' "${DMRAID}"
439	append_data 'evms' "${EVMS}"	456	append_data 'evms' "${EVMS}"
		457	append_data 'mdadm' "${MDADM}"
440		458
441	if [ "${NOINITRDMODULES}" = '' ]	459	if [ "${NOINITRDMODULES}" = '' ]
442	then	460	then