Attachment #132494 for bug #172128

Lines 77-82 Link Here

(-)/usr/share/genkernel/gen_cmdline.sh (+5 lines)
77	echo " --> 'emerge evms' in the host operating system"	77	echo " --> 'emerge evms' in the host operating system"
78	echo " first"	78	echo " first"
79	echo " --lvm2 Include LVM2 support"	79	echo " --lvm2 Include LVM2 support"
		80	echo " --mdadm Copy /etc/mdadm.conf to initramfs"
80	# echo " --unionfs Include UNIONFS support"	81	# echo " --unionfs Include UNIONFS support"
81	echo " --dmraid Include DMRAID support"	82	echo " --dmraid Include DMRAID support"
82	echo " --suspend Include userspace suspend/resume (uswsusp) support"	83	echo " --suspend Include userspace suspend/resume (uswsusp) support"
Lines 227-232 Link Here
227	print_warning 1 "This code is subject to change at any time."	228	print_warning 1 "This code is subject to change at any time."
228	echo	229	echo
229	;;	230	;;
		231	--mdadm)
		232	CMD_MDADM=1
		233	print_info 2 "CMD_MDADM: $CMD_MDADM"
		234	;;
230	--lvm2)	235	--lvm2)
231	CMD_LVM2=1	236	CMD_LVM2=1
232	print_info 2 "CMD_LVM2: $CMD_LVM2"	237	print_info 2 "CMD_LVM2: $CMD_LVM2"

Lines 465-470 Link Here

(-)/usr/share/genkernel/gen_determineargs.sh (+7 lines)
465	DMRAID=0	465	DMRAID=0
466	fi	466	fi
467		467
		468	if isTrue "${CMD_MDADM}"
		469	then
		470	MDADM=1
		471	else
		472	MDADM=0
		473	fi
		474
468	get_KV	475	get_KV
469	UNIONFS_MODULES_BINCACHE=`kv_replace "${UNIONFS_MODULES_BINCACHE}"`	476	UNIONFS_MODULES_BINCACHE=`kv_replace "${UNIONFS_MODULES_BINCACHE}"`
470	}	477	}




	rm -r "${TEMP}/initramfs-evms2-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/"
	[ "${MDADM}" -eq '1' ] && { /bin/cp -f /etc/mdadm.conf "${TEMP}/initramfs-udev-temp/etc" ||
		gen_die "Could not copy mdadm.conf!"; }
	cd "${TEMP}/initramfs-mdadm-temp/"
	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
	rm -rf "${TEMP}/initramfs-mdadm-temp" > /dev/null
}

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

	append_data 'lvm2' "${LVM2}"
	append_data 'dmraid' "${DMRAID}"
	append_data 'evms2' "${EVMS2}"
	append_data 'mdadm' "${MDADM}"
	
	if [ "${NOINITRDMODULES}" = '' ]
	then

Lines 557-562 Link Here

(-)/usr/share/genkernel/generic/initrd.scripts (+9 lines)
557	ln -sf /dev/device-mapper /dev/mapper/control	557	ln -sf /dev/device-mapper /dev/mapper/control
558	fi	558	fi
559		559
		560	if [ "${USE_MDADM}" -eq '1' ]
		561	then
		562	if [ ! -e '/etc/mdadm.conf' ]
		563	then
		564	/sbin/mdadm --examine > /etc/mdadm.conf
		565	fi
		566	/sbin/mdadm --assemble
		567	fi
		568
560	if [ "${USE_DMRAID_NORMAL}" -eq '1' ]	569	if [ "${USE_DMRAID_NORMAL}" -eq '1' ]
561	then	570	then
562	if [ -e '/sbin/dmraid' ]	571	if [ -e '/sbin/dmraid' ]

Lines 119-124 Link Here

(-)/usr/share/genkernel/generic/linuxrc (+3 lines)
119	dolvm2)	119	dolvm2)
120	USE_LVM2_NORMAL=1	120	USE_LVM2_NORMAL=1
121	;;	121	;;
		122	domdadm)
		123	USE_MDADM=1
		124	;;
122	dodmraid)	125	dodmraid)
123	USE_DMRAID_NORMAL=1	126	USE_DMRAID_NORMAL=1
124	;;	127	;;

Lines 376-381 Link Here

(-)/usr/share/genkernel/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

Return to bug 172128

Lines 289-294 Link Here

(-)/usr/share/genkernel/gen_initramfs.sh (+15 lines)
289	rm -r "${TEMP}/initramfs-evms2-temp/"	289	rm -r "${TEMP}/initramfs-evms2-temp/"
290	}	290	}
291		291
		292	append_mdadm(){
		293	if [ -d "${TEMP}/initramfs-mdadm-temp" ]
		294	then
		295	rm -r "${TEMP}/initramfs-mdadm-temp/"
		296	fi
		297	cd ${TEMP}
		298	mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/"
		299	[ "${MDADM}" -eq '1' ] && { /bin/cp -f /etc/mdadm.conf "${TEMP}/initramfs-udev-temp/etc" \|\|
		300	gen_die "Could not copy mdadm.conf!"; }
		301	cd "${TEMP}/initramfs-mdadm-temp/"
		302	find . -print \| cpio ${CPIO_ARGS} --append -F "${CPIO}"
		303	rm -rf "${TEMP}/initramfs-mdadm-temp" > /dev/null
		304	}
		305
292	append_gensplash(){	306	append_gensplash(){
293	if [ -x /usr/bin/splash_geninitramfs ] \|\| [ -x /sbin/splash_geninitramfs ]	307	if [ -x /usr/bin/splash_geninitramfs ] \|\| [ -x /sbin/splash_geninitramfs ]
294	then	308	then
Lines 500-505 Link Here
500	append_data 'lvm2' "${LVM2}"	514	append_data 'lvm2' "${LVM2}"
501	append_data 'dmraid' "${DMRAID}"	515	append_data 'dmraid' "${DMRAID}"
502	append_data 'evms2' "${EVMS2}"	516	append_data 'evms2' "${EVMS2}"
		517	append_data 'mdadm' "${MDADM}"
503		518
504	if [ "${NOINITRDMODULES}" = '' ]	519	if [ "${NOINITRDMODULES}" = '' ]
505	then	520	then