Attachment #131688 for bug #193514

Lines 45-50 longusage() { Link Here

(-)genkernel-orig/gen_cmdline.sh (-1 / +6 lines)
45	echo " --static Build a static (monolithic kernel)."	45	echo " --static Build a static (monolithic kernel)."
46	echo " --initramfs Builds initramfs before kernel and embeds it"	46	echo " --initramfs Builds initramfs before kernel and embeds it"
47	echo " into the kernel."	47	echo " into the kernel."
		48	echo " --v86d Install v86d into the initramfs (required for uvesafb)"
48	echo " Kernel settings"	49	echo " Kernel settings"
49	echo " --kerneldir=<dir> Location of the kernel sources"	50	echo " --kerneldir=<dir> Location of the kernel sources"
50	echo " --kernel-config=<file> Kernel configuration file to use for compilation"	51	echo " --kernel-config=<file> Kernel configuration file to use for compilation"
Lines 65-71 longusage() { Link Here
65	echo " autodetect."	66	echo " autodetect."
66	echo " --makeopts=<makeopts> Make options such as -j2, etc..."	67	echo " --makeopts=<makeopts> Make options such as -j2, etc..."
67	echo " --mountboot Mount BOOTDIR automatically if mountable"	68	echo " --mountboot Mount BOOTDIR automatically if mountable"
68	echo " --no-mountboot Don't mount BOOTDIR automatically"	69	echo " --no-mountboot Don't mount BOOTDIR automatically"
69	echo " --bootdir=<dir> Set the location of the boot-directory, default is /boot"	70	echo " --bootdir=<dir> Set the location of the boot-directory, default is /boot"
70	echo " Initialization"	71	echo " Initialization"
71	echo " --gensplash=<theme> Enable framebuffer splash using <theme>"	72	echo " --gensplash=<theme> Enable framebuffer splash using <theme>"
Lines 374-379 parse_cmdline() { Link Here
374	CMD_INITRAMFS=1	375	CMD_INITRAMFS=1
375	print_info 2 "CMD_INITRAMFS: ${CMD_INITRAMFS}"	376	print_info 2 "CMD_INITRAMFS: ${CMD_INITRAMFS}"
376	;;	377	;;
		378	--v86d)
		379	CMD_V86D=1
		380	print_info 2 "CMD_V86D: ${CMD_V86D}"
		381	;;
377	--tempdir=*)	382	--tempdir=*)
378	TMPDIR=`parse_opt "$*"`	383	TMPDIR=`parse_opt "$*"`
379	TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$	384	TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$




	chmod +x "${TEMP}/initramfs-aux-temp/sbin/modprobe"
	cd "${TEMP}/initramfs-aux-temp/"
	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
	rm -r "${TEMP}/initramfs-aux-temp/"
}

append_v86d() {
	if [ -e /sbin/v86d ]; then
		echo "/sbin/v86d" | cpio ${CPIO_ARGS} --append -F "${CPIO}"
	else
		print_warning 1 '               >> No v86d detected; skipping!'
	fi
}

append_data() {

	append_data 'lvm' "${LVM}"
	append_data 'dmraid' "${DMRAID}"
	append_data 'evms' "${EVMS}"
	append_data 'v86d' "${CMD_V86D}"

	if [ "${NOINITRDMODULES}" = '' ]
	then
		append_data 'modules'

Lines 28-35 case "$*" in Link Here

(-)genkernel-orig/genkernel (-3 / +2 lines)
28	--config=*)	28	--config=*)
29	CMD_GK_CONFIG=`parse_opt "$*"`	29	CMD_GK_CONFIG=`parse_opt "$*"`
30	;;	30	;;
31	esac	31	esac
32	}
33		32
34	source ${CMD_GK_CONFIG:-/etc/genkernel.conf} \|\| small_die "Could not read /etc/genkernel.conf"	33	source ${CMD_GK_CONFIG:-/etc/genkernel.conf} \|\| small_die "Could not read /etc/genkernel.conf"
35		34
Lines 392-398 then Link Here
392	echo	391	echo
393	print_info 1 'WARNING... WARNING... WARNING...'	392	print_info 1 'WARNING... WARNING... WARNING...'
394	print_info 1 'Additional kernel cmdline arguments that may be required to boot properly...'	393	print_info 1 'Additional kernel cmdline arguments that may be required to boot properly...'
395	[ "${SPLASH}" -eq '1' ] && print_info 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"	394	[ "${SPLASH}" -eq '1' ] && print_info 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use fbsplash ]"
396	[ "${LVM}" -eq '1' ] && print_info 1 'add "dolvm" for lvm support'	395	[ "${LVM}" -eq '1' ] && print_info 1 'add "dolvm" for lvm support'
397	[ "${EVMS}" -eq '1' ] && print_info 1 'add "doevms" for evms support'	396	[ "${EVMS}" -eq '1' ] && print_info 1 'add "doevms" for evms support'
398	[ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support'	397	[ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support'

Return to bug 193514

Lines 405-411 append_auxilary() { Link Here

(-)genkernel-orig/gen_initramfs.sh (-2 / +11 lines)
405	chmod +x "${TEMP}/initramfs-aux-temp/sbin/modprobe"	405	chmod +x "${TEMP}/initramfs-aux-temp/sbin/modprobe"
406	cd "${TEMP}/initramfs-aux-temp/"	406	cd "${TEMP}/initramfs-aux-temp/"
407	find . -print \| cpio ${CPIO_ARGS} --append -F "${CPIO}"	407	find . -print \| cpio ${CPIO_ARGS} --append -F "${CPIO}"
408	rm -r "${TEMP}/initramfs-aux-temp/"	408	rm -r "${TEMP}/initramfs-aux-temp/"
		409	}
		410
		411	append_v86d() {
		412	if [ -e /sbin/v86d ]; then
		413	echo "/sbin/v86d" \| cpio ${CPIO_ARGS} --append -F "${CPIO}"
		414	else
		415	print_warning 1 ' >> No v86d detected; skipping!'
		416	fi
409	}	417	}
410		418
411	append_data() {	419	append_data() {
Lines 436-442 create_initramfs() { Link Here
436	append_data 'lvm' "${LVM}"	444	append_data 'lvm' "${LVM}"
437	append_data 'dmraid' "${DMRAID}"	445	append_data 'dmraid' "${DMRAID}"
438	append_data 'evms' "${EVMS}"	446	append_data 'evms' "${EVMS}"
439		447	append_data 'v86d' "${CMD_V86D}"
		448
440	if [ "${NOINITRDMODULES}" = '' ]	449	if [ "${NOINITRDMODULES}" = '' ]
441	then	450	then
442	append_data 'modules'	451	append_data 'modules'