Attachment #242125 for bug #330127




  echo
  echo "Available Options: "
  echo "  Configuration settings"
  echo "	--local			Local mode; source modules from current directory"
  echo "	--config=<file>	genkernel configuration file to use"
  echo "  Debug settings"
  echo "	--loglevel=<0-5>	Debug Verbosity Level"

  echo "	--no-clean		Do not run make clean before compilation"
  echo "	--no-mrproper		Do not run make mrproper before compilation"
  echo "	--oldconfig		Implies --no-clean and runs a 'make oldconfig'"
  echo "	--gensplash		Install framebuffer splash support into initramfs"
  echo "	--splash		Install framebuffer splash support into initramfs"
  echo "	--no-splash		Do not install framebuffer splash"
  echo "	--install		Install the kernel after building"
  echo "	--no-install		Do not install the kernel after building"
  echo "	--symlink		Manage symlinks in /boot for installed images"
  echo "	--no-symlink		Do not manage symlinks"
  echo "	--no-ramdisk-modules	Don't copy any modules to the ramdisk"
  echo "	--all-ramdisk-modules	Copy all kernel modules to the ramdisk"
  echo "	--callback=<...>	Run the specified arguments after the"
  echo "				kernel and modules have been compiled"
  echo "	--static		Build a static (monolithic kernel)."

  echo "				autodetect."
  echo "	--makeopts=<makeopts>	Make options such as -j2, etc..."
  echo "	--mountboot		Mount BOOTDIR automatically if mountable"
  echo "	--no-mountboot		Don't mount BOOTDIR automatically"
  echo "	--bootdir=<dir>		Set the location of the boot-directory, default is /boot"
  echo "  Initialization"
  echo "	--bootloader=grub	Add new kernel to GRUB configuration"
  echo "	--dmraid		Include DMRAID support"
  echo "	--iscsi			Include iSCSI support"
  echo "	--luks			Include LUKS support"
  echo "				--> 'emerge cryptsetup-luks' with USE=-dynamic"
  echo "	--lvm			Include LVM support"
  echo "	--mdadm			Copy /etc/mdadm.conf to initramfs"
  echo "				(obsolete with Dracut; use --mdraid)"
  echo "	--multipath		Include Multipath support"
  echo "  Internal engine"
  echo "	--all-ramdisk-modules	Copy all kernel modules to the ramdisk"
  echo "	--do-keymap-auto	Forces keymap selection at boot"
  echo "	--no-keymap		Disables keymap selection support"
  echo "	--splash		Enable framebuffer splash using default theme"
  echo "	--splash=<theme>	Enable framebuffer splash using <theme>"
  echo "	--splash-res=<res>	Select splash theme resolutions to install"
  echo "	--no-splash		Do not install framebuffer splash"
  echo "	--evms			Include EVMS support"
  echo "				--> 'emerge evms' in the host operating system"
  echo "				first"
  echo "	--evms2			Include EVMS support"
  echo "				--> 'emerge evms' in the host operating system"
  echo "				first"
  echo "	--lvm			Include LVM support"
  echo "	--lvm2			Include LVM support"
  echo "	--mdadm			Copy /etc/mdadm.conf to initramfs"
  echo "	--dmraid		Include DMRAID support"
  echo "	--multipath		Include Multipath support"
  echo "	--iscsi			Include iSCSI support"
  echo "	--slowusb		Enables extra pauses for slow USB CD boots"
  echo "	--no-busybox		Do not include busybox in the initramfs."
  echo "	--unionfs		Include EXPERIMENTAL support for unionfs"
  echo "	--netboot		Create a self-contained env in the initramfs"
  echo "	--real-root=<foo>	Specify a default for real_root="
  echo "	--linuxrc=<file>	Specifies a user created linuxrc"
  echo "	--busybox-config=<file>	Specifies a user created busybox config"
  echo "	--disklabel		Include disk label and uuid support in your"
  echo "				ramdisk"
  echo "  Dracut engine"
  echo "	--no-dracut		Build system using old internal engine"
  echo "				(will be removed in the future)"
  echo "	--dracut-dir=<dir>	Directory of Dracut sources; if given Dracut"
  echo "				is run in local mode (see description of '-l'"
  echo "				in 'man 8 dracut'); script changes current"
  echo "				directory to <dir>, so don't use relative"
  echo "				paths then"
  echo "	--auto			Rely on Dracut system check instead of"
  echo "				specifying modules by hand"
  echo "	--generic		Build generic initramfs instead of"
  echo "				default hostonly.  Notice that generic => huge"
  echo "	--mdraid		Include RAID support via mdadm"
  echo "	--gensplash		Enable framebuffer splash (splashutils);"
  echo "				set up in /etc/conf.d/splash"
  echo "	--gensplash=<theme>[:<res>]"
  echo "				Enable framebuffer splash using <theme>"
  echo "				and optionally select splash theme resolutions"
  echo "				to install; <res> is comma-separated list of"
  echo "				resolutions"
  echo "	--no-gensplash		Do not install framebuffer splash"
  echo "	--gensplash-no8bpp	Ignore 8bpp gensplash images (can save a lot of"
  echo "				space)"
  echo "	--plymouth		Enable EXPERIMENTAL Plymouth splash; set up"
  echo "				configuration in /etc/plymouth/plymouthd.conf"
  echo "				requires >=plymouth-0.8.3 to be installed"
  echo "	--add-modules=<modules list>"
  echo "				Additional Dracut modules;"
  echo "				see /usr/share/dracut/modules.d for possible"
  echo "				values; separate modules by space, e.g.:"
  echo "				--add-modules=\"lvm crypt nfs\""
  echo "	--extra-options=<options>"
  echo "				Pass extra options to dracut;"
  echo "				see 'man 8 dracut'"
  echo "  Internals"
  echo "	--arch-override=<arch>	Force to arch instead of autodetect"
  echo "	--cachedir=<dir>	Override the default cache location"

}

parse_cmdline() {
	local tmp

	case "$*" in
		--kernel-cc=*)
			CMD_KERNEL_CC=`parse_opt "$*"`

			CMD_BOOTDIR=`parse_opt "$*"`
			print_info 2 "CMD_BOOTDIR: ${CMD_BOOTDIR}"
			;;
		--do-keymap-auto)
			CMD_DOKEYMAPAUTO=1
			CMD_KEYMAP=1
			print_info 2 "CMD_DOKEYMAPAUTO: ${CMD_DOKEYMAPAUTO}"
			;;
		--no-keymap)
			CMD_KEYMAP=0
			print_info 2 "CMD_KEYMAP: ${CMD_KEYMAP}"
			;;
		--evms)
			CMD_EVMS=1
			print_info 2 "CMD_EVMS: ${CMD_EVMS}"
			;;
		--evms2)
			CMD_EVMS=1
			print_info 2 "CMD_EVMS: ${CMD_EVMS}"
			echo
			print_warning 1 "Please use --evms, as --evms2 is deprecated."
			;;
		--lvm)
			CMD_LVM=1
			print_info 2 "CMD_LVM: ${CMD_LVM}"

			print_warning 1 "Please use --lvm, as --lvm2 is deprecated."
			;;
		--mdadm)
			if ! [[ "${CMD_DRACUT}" = '0' ]] && ! [[ $* =~ --no-dracut ]]; then
				CMD_MDRAID=1
				print_info 2 "CMD_MDRAID: $CMD_MDRAID"
				echo
				print_warning 1 "Please use --mdraid, as --mdadm is obsolete."
			else
				CMD_MDADM=1
				print_info 2 "CMD_MDADM: $CMD_MDADM"
			fi
			print_info 2 "CMD_UNIONFS: ${CMD_UNIONFS}"
			;;
		--netboot)
			CMD_NETBOOT=1
			print_info 2 "CMD_NETBOOT: ${CMD_NETBOOT}"
			;;
		--real-root=*)
			CMD_REAL_ROOT=`parse_opt "$*"`
			print_info 2 "CMD_REAL_ROOT: ${CMD_REAL_ROOT}"
			;;
		--slowusb)
			CMD_SLOWUSB=1
			print_info 2 "CMD_SLOWUSB: ${CMD_SLOWUSB}"
			;;
		--dmraid)
			if [ ! -e /usr/include/libdevmapper.h ]

			print_info 2 "CMD_CLEAN: ${CMD_CLEAN}"
			print_info 2 "CMD_OLDCONFIG: ${CMD_OLDCONFIG}"
			;;
		--gensplash=*)
			CMD_SPLASH=1
			SPLASH_THEME=`parse_opt "$*"`
			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
			print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
			echo
			print_warning 1 "Please use --splash, as --gensplash is deprecated."
			;;
		--gensplash)
			CMD_SPLASH=1
			SPLASH_THEME='default'
			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
			echo
			print_warning 1 "Please use --splash, as --gensplash is deprecated."
			;;
		--splash=*)
			CMD_SPLASH=1
			SPLASH_THEME=`parse_opt "$*"`
			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
			print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
			;;
		--splash)
			CMD_SPLASH=1
			SPLASH_THEME='default'
			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
			;;
		--no-splash)
			CMD_SPLASH=0
			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
			;;
		--gensplash-res=*)
			SPLASH_RES=`parse_opt "$*"`
			print_info 2 "SPLASH_RES: ${SPLASH_RES}"
			echo
			print_warning 1 "Please use --splash-res, as --gensplash-res is deprecated."
			;;
		--splash-res=*)
			SPLASH_RES=`parse_opt "$*"`
			print_info 2 "SPLASH_RES: ${SPLASH_RES}"
			;;
		--install)
			CMD_NOINSTALL=0
			print_info 2 "CMD_NOINSTALL: ${CMD_NOINSTALL}"

			CMD_NORAMDISKMODULES=1
			print_info 2 "CMD_NORAMDISKMODULES: ${CMD_NORAMDISKMODULES}"
			;;
		--all-ramdisk-modules)
			CMD_ALLRAMDISKMODULES=1
			print_info 2 "CMD_ALLRAMDISKMODULES: ${CMD_ALLRAMDISKMODULES}"
			;;
		--callback=*)
			CMD_CALLBACK=`parse_opt "$*"`
			print_info 2 "CMD_CALLBACK: ${CMD_CALLBACK}/$*"

			TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
			print_info 2 "TMPDIR: ${TMPDIR}"
			print_info 2 "TEMP: ${TEMP}"
			;;
		--postclear)
			CMD_POSTCLEAR=1
			print_info 2 "CMD_POSTCLEAR: ${CMD_POSTCLEAR}"
			;;
		--arch-override=*)
			CMD_ARCHOVERRIDE=`parse_opt "$*"`
			print_info 2 "CMD_ARCHOVERRIDE: ${CMD_ARCHOVERRIDE}"

			CMD_INITRAMFS_OVERLAY=`parse_opt "$*"`
			print_info 2 "CMD_INITRAMFS_OVERLAY: ${CMD_INITRAMFS_OVERLAY}"
			;;
		--linuxrc=*)
			CMD_LINUXRC=`parse_opt "$*"`
			print_info 2 "CMD_LINUXRC: ${CMD_LINUXRC}"
			;;
		--busybox-config=*)
			CMD_BUSYBOX_CONFIG=`parse_opt "$*"`
			print_info 2 "CMD_BUSYBOX_CONFIG: ${CMD_BUSYBOX_CONFIG}"
			;;
		--genzimage)
			KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'
			KERNEL_BINARY_2='arch/powerpc/boot/zImage.initrd'

#			ENABLE_PEGASOS_HACKS="yes"
#			print_info 2 "ENABLE_PEGASOS_HACKS: ${ENABLE_PEGASOS_HACKS}"
			;;
		--disklabel)
			CMD_DISKLABEL=1
			print_info 2 "CMD_DISKLABEL: ${CMD_DISKLABEL}"
			;;
		--luks)
			if ! [[ "${CMD_DRACUT}" = '0' ]] && ! [[ $* =~ --no-dracut ]]; then
				CMD_CRYPT=1
				print_info 2 "CMD_CRYPT: ${CMD_CRYPT}"
				echo
				print_warning 1 "Please use --crypt, as --luks is obsolete."
			else
				CMD_LUKS=1
				print_info 2 "CMD_LUKS: ${CMD_LUKS}"
			fi
			;;
		--firmware)
			CMD_FIRMWARE=1

		--config=*)
			print_info 2 "CMD_GK_CONFIG: `parse_opt "$*"`"
			;;
		--local)
		;;

		# Internal engine
		--no-busybox)
			CMD_BUSYBOX=0
			print_info 2 "CMD_BUSYBOX: ${CMD_BUSYBOX}"
			;;
		--unionfs)
			CMD_UNIONFS=1
			print_info 2 "CMD_UNIONFS: ${CMD_UNIONFS}"
			;;
		--netboot)
			CMD_NETBOOT=1
			print_info 2 "CMD_NETBOOT: ${CMD_NETBOOT}"
			;;
		--real-root=*)
			CMD_REAL_ROOT=`parse_opt "$*"`
			print_info 2 "CMD_REAL_ROOT: ${CMD_REAL_ROOT}"
			;;
		--slowusb)
			CMD_SLOWUSB=1
			print_info 2 "CMD_SLOWUSB: ${CMD_SLOWUSB}"
			;;
		--do-keymap-auto)
			CMD_DOKEYMAPAUTO=1
			CMD_KEYMAP=1
			print_info 2 "CMD_DOKEYMAPAUTO: ${CMD_DOKEYMAPAUTO}"
			;;
		--no-keymap)
			CMD_KEYMAP=0
			print_info 2 "CMD_KEYMAP: ${CMD_KEYMAP}"
			;;
		--evms)
			CMD_EVMS=1
			print_info 2 "CMD_EVMS: ${CMD_EVMS}"
			;;
		--evms2)
			CMD_EVMS=1
			print_info 2 "CMD_EVMS: ${CMD_EVMS}"
			echo
			print_warning 1 "Please use --evms, as --evms2 is deprecated."
			;;
		--disklabel)
			CMD_DISKLABEL=1
			print_info 2 "CMD_DISKLABEL: ${CMD_DISKLABEL}"
			;;
		--all-ramdisk-modules)
			CMD_ALLRAMDISKMODULES=1
			print_info 2 "CMD_ALLRAMDISKMODULES: ${CMD_ALLRAMDISKMODULES}"
			;;
		--linuxrc=*)
			CMD_LINUXRC=`parse_opt "$*"`
			print_info 2 "CMD_LINUXRC: ${CMD_LINUXRC}"
			;;
		--busybox-config=*)
			CMD_BUSYBOX_CONFIG=`parse_opt "$*"`
			print_info 2 "CMD_BUSYBOX_CONFIG: ${CMD_BUSYBOX_CONFIG}"
			;;
		--splash=*)
			CMD_SPLASH=1
			SPLASH_THEME=`parse_opt "$*"`
			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
			print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
			;;
		--splash)
			CMD_SPLASH=1
			SPLASH_THEME='default'
			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
			;;
		--no-splash)
			CMD_SPLASH=0
			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
			;;
		--splash-res=*)
			SPLASH_RES=`parse_opt "$*"`
			print_info 2 "SPLASH_RES: ${SPLASH_RES}"
			;;

	   	# Dracut engine
		--no-dracut)
			CMD_DRACUT=0
			print_info 2 "CMD_DRACUT: ${CMD_DRACUT}"
			;;
		--dracut-dir=*)
			CMD_DRACUT_DIR=`parse_opt "$*"`
			print_info 2 "CMD_DRACUT_DIR: ${CMD_DRACUT_DIR}"
			;;
		--auto)
			CMD_AUTO=1
			print_info 2 "CMD_AUTO: ${CMD_AUTO}"
			;;
		--generic)
			CMD_GENERIC=1
			print_info 2 "CMD_GENERIC: ${CMD_GENERIC}"
			;;
		--mdraid)
			CMD_MDRAID=1
			print_info 2 "CMD_MDRAID: ${CMD_MDRAID}"
			;;
		--crypt)
			CMD_CRYPT=1
			print_info 2 "CMD_CRYPT: ${CMD_CRYPT}"
			;;
		--gensplash)
			CMD_GENSPLASH=1
			print_info 2 "CMD_GENSPLASH: ${CMD_GENSPLASH}"
			;;
		--gensplash=*)
			CMD_GENSPLASH=1
			tmp=`parse_opt "$*"`
			GENSPLASH_THEME=${tmp%%:*}
			print_info 2 "GENSPLASH: ${GENSPLASH}"
			print_info 2 "GENSPLASH_THEME: ${GENSPLASH_THEME}"
			[[ ${tmp} =~ : ]] && {
				GENSPLASH_RES=${tmp#*:}
				print_info 2 "GENSPLASH_RES: ${GENSPLASH_RES}"
			}
			;;
		--plymouth)
			CMD_PLYMOUTH=1
			print_info 2 "CMD_PLYMOUTH: ${CMD_PLYMOUTH}"
			;;
		--add-modules=*)
			CMD_ADD_MODULES=`parse_opt "$*"`
			print_info 2 "CMD_ADD_MODULES: ${CMD_ADD_MODULES}"
			;;
		--extra-options=*)
			CMD_EXTRA_OPTIONS=`parse_opt "$*"`
			print_info 2 "CMD_EXTRA_OPTIONS: ${CMD_EXTRA_OPTIONS}"
			;;

		all)
			BUILD_KERNEL=1
			BUILD_MODULES=1

Lines 97-103 determine_real_args() { Link Here

(-)a/gen_determineargs.sh (-2 / +12 lines)
97	set_config_with_override 1 MOUNTBOOT CMD_MOUNTBOOT	97	set_config_with_override 1 MOUNTBOOT CMD_MOUNTBOOT
98	set_config_with_override 1 BUILD_STATIC CMD_STATIC	98	set_config_with_override 1 BUILD_STATIC CMD_STATIC
99	set_config_with_override 1 SAVE_CONFIG CMD_SAVE_CONFIG	99	set_config_with_override 1 SAVE_CONFIG CMD_SAVE_CONFIG
100	set_config_with_override 1 SYMLINK CMD_SYMLINK	100	set_config_with_override 1 SYMLINK CMD_SYMLINK
101	set_config_with_override 2 INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH	101	set_config_with_override 2 INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH
102	set_config_with_override 1 OLDCONFIG CMD_OLDCONFIG	102	set_config_with_override 1 OLDCONFIG CMD_OLDCONFIG
103	set_config_with_override 1 LVM CMD_LVM	103	set_config_with_override 1 LVM CMD_LVM
Lines 120-125 determine_real_args() { Link Here
120	set_config_with_override 1 KEYMAP CMD_KEYMAP "yes"	120	set_config_with_override 1 KEYMAP CMD_KEYMAP "yes"
121	set_config_with_override 1 DOKEYMAPAUTO CMD_DOKEYMAPAUTO	121	set_config_with_override 1 DOKEYMAPAUTO CMD_DOKEYMAPAUTO
122	set_config_with_override 2 BUSYBOX_CONFIG CMD_BUSYBOX_CONFIG	122	set_config_with_override 2 BUSYBOX_CONFIG CMD_BUSYBOX_CONFIG
		123	set_config_with_override 1 AUTO CMD_AUTO
		124	set_config_with_override 1 GENERIC CMD_GENERIC
		125	set_config_with_override 1 DRACUT CMD_DRACUT "yes"
		126	set_config_with_override 2 DRACUT_DIR CMD_DRACUT_DIR
		127	set_config_with_override 1 MDRAID CMD_MDRAID
		128	set_config_with_override 1 CRYPT CMD_CRYPT
		129	set_config_with_override 1 PLYMOUTH CMD_PLYMOUTH
		130	set_config_with_override 1 GENSPLASH CMD_GENSPLASH
		131	set_config_with_override 2 ADD_MODULES CMD_ADD_MODULES
		132	set_config_with_override 2 EXTRA_OPTIONS CMD_EXTRA_OPTIONS
123		133
124	BOOTDIR=`arch_replace "${BOOTDIR}"`	134	BOOTDIR=`arch_replace "${BOOTDIR}"`
125	BOOTDIR=${BOOTDIR%/} # Remove any trailing slash	135	BOOTDIR=${BOOTDIR%/} # Remove any trailing slash
Lines 133-139 determine_real_args() { Link Here
133	BLKID_BINCACHE=`cache_replace "${BLKID_BINCACHE}"`	143	BLKID_BINCACHE=`cache_replace "${BLKID_BINCACHE}"`
134	FUSE_BINCACHE=`cache_replace "${FUSE_BINCACHE}"`	144	FUSE_BINCACHE=`cache_replace "${FUSE_BINCACHE}"`
135	UNIONFS_FUSE_BINCACHE=`cache_replace "${UNIONFS_FUSE_BINCACHE}"`	145	UNIONFS_FUSE_BINCACHE=`cache_replace "${UNIONFS_FUSE_BINCACHE}"`
136		146
137	DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"`	147	DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"`
138	BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"`	148	BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"`
139	BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"`	149	BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"`




#!/bin/bash
# $Id$

BASIC_MODULES=dash\ i18n\ kernel-modules\ resume\ rootfs-block\ terminfo
BASIC_MODULES+=\ udev-rules\ uswsusp\ base
MODULES=lvm\ dmraid\ iscsi\ mdraid\ crypt\ multipath\ plymouth\ gensplash

dracut_modules() {
	local a=() o=()

	isTrue "${PLYMOUTH}" && isTrue "${GENSPLASH}" && gen_die 'Gentoo Splash and Plymouth selected!  You cannot choose both splash engines.'
	isTrue "${EVMS}" && gen_die 'EVMS is no longer supported.  If you *really* need it, file a bug report and we bring it back to life.'
	isTrue "${UNIONFS}" && gen_die 'UnionFS not yet supported.'

	for var in ${MODULES}
	do
		var="${var^^}"
		isTrue "${!var}" && a+=(${var,,})
	done

	a+=(${ADD_MODULES})

	! isTrue "${AUTO}" && echo -n "-m '${BASIC_MODULES}'"
	[[ ${a[*]} ]] && echo -n " -a '${a[*]}'"
	[[ ${o[*]} ]] && echo -n " -o '${o[*]}'"
}

create_initramfs() {
	local tmprd="${TMPDIR}/initramfs-${KV}" opts='-f -v' add_files=()

	print_info 1 'initramfs: >> Initializing Dracut...'

	if isTrue "${GENERIC}"
	then
		print_info 1 '           >> Will build generic (read: huge) initramfs'
	else
		opts+=\ -H
	fi

	if isTrue "${NORAMDISKMODULES}"
	then
		print_info 1 '           >> Not copying kernel modules and firmware...'
		opts+=\ --ignore-kernel-modules
	else
		isTrue "${FIRMWARE}" && opts+=" --fwdir ${FIRMWARE_DIR}"
		[[ ${FIRMWARE_FILES} ]] && add_files+=(${FIRMWARE_FILES})
	fi

	[[ ${DRACUT_DIR} ]] && opts="-l ${opts}"
	[[ ${INITRAMFS_OVERLAY} ]] && opts+=" ${INITRAMFS_OVERLAY} /"
	[[ ${add_files[*]} ]] && opts+=" -I '${add_files[*]}'"
	opts+=" ${EXTRA_OPTIONS}"
	opts+=" $(dracut_modules)"

	export DRACUT_GENSPLASH_THEME=${GENSPLASH_THEME}
	export DRACUT_GENSPLASH_RES=${GENSPLASH_RES}
	print_info 1 "           >> DRACUT_GENSPLASH_THEME=${GENSPLASH_THEME}"
	print_info 1 "           >> DRACUT_GENSPLASH_RES=${GENSPLASH_RES}"
	print_info 1 "           >> dracut ${opts} '${tmprd}' '${KV}'"
	if [[ ${DRACUT_DIR} ]]; then
		cd "${DRACUT_DIR}"
		eval ./dracut ${opts} \'${tmprd}\' \'${KV}\'
		cd - >/dev/null
	else
		eval dracut ${opts} \'${tmprd}\' \'${KV}\'
	fi

	if isTrue "${INTEGRATED_INITRAMFS}"
	then
		mv ${tmprd} ${tmprd}.cpio.gz
		sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' ${KERNEL_DIR}/.config
		echo -e "CONFIG_INITRAMFS_SOURCE=\"${tmprd}.cpio.gz\"\nCONFIG_INITRAMFS_ROOT_UID=0\nCONFIG_INITRAMFS_ROOT_GID=0" \
				>> ${KERNEL_DIR}/.config
	fi

	if ! isTrue "${CMD_NOINSTALL}"
	then
		if ! isTrue "${INTEGRATED_INITRAMFS}"
		then
			copy_image_with_preserve initramfs "${tmprd}" \
				"initramfs-${KNAME}-${ARCH}-${KV}"
		fi
	fi
}

Lines 23-28 parse_opt() { Link Here

(-)a/genkernel (-36 / +80 lines)
23	esac	23	esac
24	}	24	}
25		25
		26	case "$*" in
		27	--local) GK_LOCAL_MODE=1 ;;
		28	esac
		29
26	# We don't know where our config is, so we check for it, and default to using	30	# We don't know where our config is, so we check for it, and default to using
27	# /etc/genkernel.conf if nobody has specified one.	31	# /etc/genkernel.conf if nobody has specified one.
28	case "$*" in	32	case "$*" in
Lines 32-38 case "$*" in Link Here
32	esac	36	esac
33		37
34	# Pull in our configuration	38	# Pull in our configuration
		39	[ "${GK_LOCAL_MODE}" = 1 ] && CMD_GK_CONFIG=./genkernel.conf
35	source ${CMD_GK_CONFIG:-/etc/genkernel.conf} \|\| small_die "Could not read /etc/genkernel.conf"	40	source ${CMD_GK_CONFIG:-/etc/genkernel.conf} \|\| small_die "Could not read /etc/genkernel.conf"
		41	[ "${GK_LOCAL_MODE}" = 1 ] && GK_SHARE=.
36		42
37	# Start sourcing other scripts	43	# Start sourcing other scripts
38	source ${GK_SHARE}/gen_funcs.sh \|\| small_die "Could not read ${GK_SHARE}/gen_funcs.sh"	44	source ${GK_SHARE}/gen_funcs.sh \|\| small_die "Could not read ${GK_SHARE}/gen_funcs.sh"
Lines 41-47 source ${GK_SHARE}/gen_arch.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_arch.s Link Here
41	source ${GK_SHARE}/gen_determineargs.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_determineargs.sh"	47	source ${GK_SHARE}/gen_determineargs.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_determineargs.sh"
42	source ${GK_SHARE}/gen_compile.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_compile.sh"	48	source ${GK_SHARE}/gen_compile.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_compile.sh"
43	source ${GK_SHARE}/gen_configkernel.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_configkernel.sh"	49	source ${GK_SHARE}/gen_configkernel.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_configkernel.sh"
44	source ${GK_SHARE}/gen_initramfs.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_initramfs.sh"	50	if isTrue "${DRACUT}"
		51	then
		52	source ${GK_SHARE}/gen_initramfs.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_initramfs.sh"
		53	else
		54	source ${GK_SHARE}/gen_dracut.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_dracut.sh"
		55	fi
45	source ${GK_SHARE}/gen_moddeps.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_moddeps.sh"	56	source ${GK_SHARE}/gen_moddeps.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_moddeps.sh"
46	source ${GK_SHARE}/gen_package.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_package.sh"	57	source ${GK_SHARE}/gen_package.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_package.sh"
47	source ${GK_SHARE}/gen_bootloader.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_bootloader.sh"	58	source ${GK_SHARE}/gen_bootloader.sh \|\| gen_die "Could not read ${GK_SHARE}/gen_bootloader.sh"
Lines 94-100 fi Link Here
94		105
95	clear_log	106	clear_log
96	NORMAL=${GOOD} print_info 1 "Gentoo Linux Genkernel; Version ${GK_V}${NORMAL}"	107	NORMAL=${GOOD} print_info 1 "Gentoo Linux Genkernel; Version ${GK_V}${NORMAL}"
97	print_info 1 "Running with options: ${Options}"	108	[ "${GK_LOCAL_MODE}" = 1 ] && localmsg=' in local mode'
		109	print_info 1 "Running${localmsg} with options: ${Options}"
98	echo	110	echo
99		111
100	# Set ${ARCH}	112	# Set ${ARCH}
Lines 122-130 set_kernel_arch Link Here
122		134
123	[ ! -f "${TEMP}" ] && mkdir -p "${TEMP}"	135	[ ! -f "${TEMP}" ] && mkdir -p "${TEMP}"
124		136
125	setup_cache_dir	137	if ! isTrue "${DRACUT}"
126		138	then
127	check_distfiles	139	setup_cache_dir
		140	check_distfiles
		141	fi
128		142
129	dump_debugcache	143	dump_debugcache
130		144
Lines 279-295 fi Link Here
279		293
280	if [ "${BUILD_RAMDISK}" -eq '1' ]	294	if [ "${BUILD_RAMDISK}" -eq '1' ]
281	then	295	then
282	[ "${DISKLABEL}" -eq '1' ] && compile_e2fsprogs	296	if ! isTrue "${DRACUT}"
283
284	if [ "${BUSYBOX}" -eq '1' ]
285	then	297	then
286	# Compile Busybox	298	[ "${DISKLABEL}" -eq '1' ] && compile_e2fsprogs
287	compile_busybox
288	fi
289		299
290	if isTrue "${UNIONFS}"	300	if [ "${BUSYBOX}" -eq '1' ]
291	then	301	then
292	compile_unionfs_fuse	302	# Compile Busybox
		303	compile_busybox
		304	fi
		305
		306	if isTrue "${UNIONFS}"
		307	then
		308	compile_unionfs_fuse
		309	fi
293	fi	310	fi
294		311
295	# Compile initramfs	312	# Compile initramfs
Lines 320-357 then Link Here
320	print_info 1 ''	337	print_info 1 ''
321	print_info 1 "Kernel compiled successfully!"	338	print_info 1 "Kernel compiled successfully!"
322	print_info 1 ''	339	print_info 1 ''
323	print_info 1 'Required Kernel Parameters:'	340	if ! isTrue "${DRACUT}"
324	if [ "${BUILD_RAMDISK}" -eq '0' ]
325	then	341	then
326	print_info 1 ' root=/dev/$ROOT'	342	print_info 1 'Required Kernel Parameters:'
327	print_info 1 ' [ And "vga=0x317 splash=verbose" if you use a framebuffer ]'	343
		344	if [ "${BUILD_RAMDISK}" -eq '0' ]
		345	then
		346	print_info 1 ' root=/dev/$ROOT'
		347	print_info 1 ' [ And "vga=0x317 splash=verbose" if you use a framebuffer ]'
		348	print_info 1 ''
		349	print_info 1 ' Where $ROOT is the device node for your root partition as the'
		350	print_info 1 ' one specified in /etc/fstab'
		351	else
		352	print_info 1 ' real_root=/dev/$ROOT'
		353	print_info 1 ''
		354	print_info 1 ' Where $ROOT is the device node for your root partition as the'
		355	print_info 1 ' one specified in /etc/fstab'
		356	print_info 1 ''
		357	print_info 1 "If you require Genkernel's hardware detection features; you MUST"
		358	print_info 1 'tell your bootloader to use the provided INITRAMFS file. Otherwise;'
		359	print_info 1 'substitute the root argument for the real_root argument if you are'
		360	print_info 1 'not planning to use the initramfs...'
		361	fi
		362	fi
		363	fi
		364
		365	if [ "${BUILD_RAMDISK}" -eq '1' ]
		366	then
		367	if isTrue "${DRACUT}"
		368	then
		369	print_info 1 'Required kernel arguments:'
328	print_info 1 ''	370	print_info 1 ''
329	print_info 1 ' Where $ROOT is the device node for your root partition as the'	371	print_info 1 ' root=/dev/$ROOT'
330	print_info 1 ' one specified in /etc/fstab'
331	else
332	print_info 1 ' real_root=/dev/$ROOT'
333	print_info 1 ''	372	print_info 1 ''
334	print_info 1 ' Where $ROOT is the device node for your root partition as the'	373	print_info 1 ' Where $ROOT is the device node for your root partition as the'
335	print_info 1 ' one specified in /etc/fstab'	374	print_info 1 ' one specified in /etc/fstab'
336	print_info 1 ''	375	[ "${BUILD_RAMDISK}" -eq '0' ] \|\| {
337	print_info 1 "If you require Genkernel's hardware detection features; you MUST"	376	print_info 1 ''
338	print_info 1 'tell your bootloader to use the provided INITRAMFS file. Otherwise;'	377	print_info 1 ' resume=/dev/$SWAP'
339	print_info 1 'substitute the root argument for the real_root argument if you are'	378	print_info 1 ''
340	print_info 1 'not planning to use the initramfs...'	379	print_info 1 ' Where $SWAP is the swap device used by hibernate software of your choice.'
		380	print_info 1 ''
		381	print_info 1 ' Please consult "man 7 dracut.kernel" for additional kernel arguments.'
		382	}
341	fi	383	fi
342	fi
343		384
344	if [ "${BUILD_RAMDISK}" -eq '1' ]
345	then
346	echo	385	echo
347	print_info 1 'WARNING... WARNING... WARNING...'	386	print_info 1 'WARNING... WARNING... WARNING...'
348	print_info 1 'Additional kernel cmdline arguments that may be required to boot properly...'	387	print_info 1 'Additional kernel cmdline arguments that may be required to boot properly...'
349	[ "${SPLASH}" -eq '1' ] && print_info 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"	388	if isTrue "${DRACUT}"
350	[ "${LVM}" -eq '1' ] && print_info 1 'add "dolvm" for lvm support'	389	then
351	[ "${EVMS}" -eq '1' ] && print_info 1 'add "doevms" for evms support'	390	isTrue "${GENSPLASH}" && print_info 1 "add \"splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer"
352	[ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support'	391	else
353	[ "${DMRAID}" -eq '1' ] && print_info 1 ' or "dodmraid=<additional options>"'	392	[ "${SPLASH}" -eq '1' ] && print_info 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
354	[ "${ISCSI}" -eq '1' ] && print_info 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'	393	[ "${LVM}" -eq '1' ] && print_info 1 'add "dolvm" for lvm support'
		394	[ "${EVMS}" -eq '1' ] && print_info 1 'add "doevms" for evms support'
		395	[ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support'
		396	[ "${DMRAID}" -eq '1' ] && print_info 1 ' or "dodmraid=<additional options>"'
		397	[ "${ISCSI}" -eq '1' ] && print_info 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
		398	fi
355	fi	399	fi
356		400
357	[ "${BOOTRW}" != '' ] && mount -o remount,ro ${BOOTDIR}	401	[ "${BOOTRW}" != '' ] && mount -o remount,ro ${BOOTDIR}




# compile static LVM binaries if static ones do not exist.
# LVM="no"

# Add in EVMS support from static binaries if they exist on the system: you
# should run "emerge evms" first.
# EVMS="no"

# Add DMRAID support.
# DMRAID="no"

# Include (or suppresses the inclusion of) busybox in the initrd or initramfs.
# If included, busybox is rebuilt if the cached copy is out of date.
# BUSYBOX="yes"

# Copy /etc/mdadm.conf to initramfs.
# MDADM="no"


# Specify specific firmware files to include. This overrides FIRMWARE_DIR
# FIRMWARE_FILES=""

# Add new kernel to grub?
# BOOTLOADER="grub"

# ==============Internal engine===============
#
# Enable disklabel support (copies blkid to initrd)
DISKLABEL="yes"

# Include (or suppresses the inclusion of) busybox in the initrd or initramfs.
# If included, busybox is rebuilt if the cached copy is out of date.
# BUSYBOX="yes"

# Add in EVMS support from static binaries if they exist on the system: you
# should run "emerge evms" first.
# EVMS="no"

# ===============Dracut engine================

# Build system using Dracut [yes] or old internal engine [no]. "yes" is default.
# DRACUT="yes"

# Include RAID support via mdadm
# MDRAID="no"

# =========Low Level Compile Settings=========
#
- 

Return to bug 330127

Lines 14-19 longusage() { Link Here

(-)a/gen_cmdline.sh (-126 / +209 lines)
14	echo	14	echo
15	echo "Available Options: "	15	echo "Available Options: "
16	echo " Configuration settings"	16	echo " Configuration settings"
		17	echo " --local Local mode; source modules from current directory"
17	echo " --config=<file> genkernel configuration file to use"	18	echo " --config=<file> genkernel configuration file to use"
18	echo " Debug settings"	19	echo " Debug settings"
19	echo " --loglevel=<0-5> Debug Verbosity Level"	20	echo " --loglevel=<0-5> Debug Verbosity Level"
Lines 33-47 longusage() { Link Here
33	echo " --no-clean Do not run make clean before compilation"	34	echo " --no-clean Do not run make clean before compilation"
34	echo " --no-mrproper Do not run make mrproper before compilation"	35	echo " --no-mrproper Do not run make mrproper before compilation"
35	echo " --oldconfig Implies --no-clean and runs a 'make oldconfig'"	36	echo " --oldconfig Implies --no-clean and runs a 'make oldconfig'"
36	echo " --gensplash Install framebuffer splash support into initramfs"
37	echo " --splash Install framebuffer splash support into initramfs"
38	echo " --no-splash Do not install framebuffer splash"
39	echo " --install Install the kernel after building"	37	echo " --install Install the kernel after building"
40	echo " --no-install Do not install the kernel after building"	38	echo " --no-install Do not install the kernel after building"
41	echo " --symlink Manage symlinks in /boot for installed images"	39	echo " --symlink Manage symlinks in /boot for installed images"
42	echo " --no-symlink Do not manage symlinks"	40	echo " --no-symlink Do not manage symlinks"
43	echo " --no-ramdisk-modules Don't copy any modules to the ramdisk"	41	echo " --no-ramdisk-modules Don't copy any modules to the ramdisk"
44	echo " --all-ramdisk-modules Copy all kernel modules to the ramdisk"
45	echo " --callback=<...> Run the specified arguments after the"	42	echo " --callback=<...> Run the specified arguments after the"
46	echo " kernel and modules have been compiled"	43	echo " kernel and modules have been compiled"
47	echo " --static Build a static (monolithic kernel)."	44	echo " --static Build a static (monolithic kernel)."
Lines 65-103 longusage() { Link Here
65	echo " autodetect."	62	echo " autodetect."
66	echo " --makeopts=<makeopts> Make options such as -j2, etc..."	63	echo " --makeopts=<makeopts> Make options such as -j2, etc..."
67	echo " --mountboot Mount BOOTDIR automatically if mountable"	64	echo " --mountboot Mount BOOTDIR automatically if mountable"
68	echo " --no-mountboot Don't mount BOOTDIR automatically"	65	echo " --no-mountboot Don't mount BOOTDIR automatically"
69	echo " --bootdir=<dir> Set the location of the boot-directory, default is /boot"	66	echo " --bootdir=<dir> Set the location of the boot-directory, default is /boot"
70	echo " Initialization"	67	echo " Initialization"
71	echo " --gensplash=<theme> Enable framebuffer splash using <theme>"	68	echo " --bootloader=grub Add new kernel to GRUB configuration"
72	echo " --gensplash-res=<res> Select splash theme resolutions to install"	69	echo " --dmraid Include DMRAID support"
73	echo " --splash=<theme> Enable framebuffer splash using <theme>"	70	echo " --iscsi Include iSCSI support"
74	echo " --splash-res=<res> Select splash theme resolutions to install"	71	echo " --luks Include LUKS support"
		72	echo " --> 'emerge cryptsetup-luks' with USE=-dynamic"
		73	echo " --lvm Include LVM support"
		74	echo " --mdadm Copy /etc/mdadm.conf to initramfs"
		75	echo " (obsolete with Dracut; use --mdraid)"
		76	echo " --multipath Include Multipath support"
		77	echo " Internal engine"
		78	echo " --all-ramdisk-modules Copy all kernel modules to the ramdisk"
75	echo " --do-keymap-auto Forces keymap selection at boot"	79	echo " --do-keymap-auto Forces keymap selection at boot"
76	echo " --no-keymap Disables keymap selection support"	80	echo " --no-keymap Disables keymap selection support"
		81	echo " --splash Enable framebuffer splash using default theme"
		82	echo " --splash=<theme> Enable framebuffer splash using <theme>"
		83	echo " --splash-res=<res> Select splash theme resolutions to install"
		84	echo " --no-splash Do not install framebuffer splash"
77	echo " --evms Include EVMS support"	85	echo " --evms Include EVMS support"
78	echo " --> 'emerge evms' in the host operating system"	86	echo " --> 'emerge evms' in the host operating system"
79	echo " first"	87	echo " first"
80	echo " --evms2 Include EVMS support"
81	echo " --> 'emerge evms' in the host operating system"
82	echo " first"
83	echo " --lvm Include LVM support"
84	echo " --lvm2 Include LVM support"
85	echo " --mdadm Copy /etc/mdadm.conf to initramfs"
86	echo " --dmraid Include DMRAID support"
87	echo " --multipath Include Multipath support"
88	echo " --iscsi Include iSCSI support"
89	echo " --slowusb Enables extra pauses for slow USB CD boots"	88	echo " --slowusb Enables extra pauses for slow USB CD boots"
90	echo " --bootloader=grub Add new kernel to GRUB configuration"	89	echo " --no-busybox Do not include busybox in the initramfs."
		90	echo " --unionfs Include EXPERIMENTAL support for unionfs"
		91	echo " --netboot Create a self-contained env in the initramfs"
		92	echo " --real-root=<foo> Specify a default for real_root="
91	echo " --linuxrc=<file> Specifies a user created linuxrc"	93	echo " --linuxrc=<file> Specifies a user created linuxrc"
92	echo " --busybox-config=<file> Specifies a user created busybox config"	94	echo " --busybox-config=<file> Specifies a user created busybox config"
93	echo " --disklabel Include disk label and uuid support in your"	95	echo " --disklabel Include disk label and uuid support in your"
94	echo " ramdisk"	96	echo " ramdisk"
95	echo " --luks Include LUKS support"	97	echo " Dracut engine"
96	echo " --> 'emerge cryptsetup-luks' with USE=-dynamic"	98	echo " --no-dracut Build system using old internal engine"
97	echo " --no-busybox Do not include busybox in the initramfs."	99	echo " (will be removed in the future)"
98	echo " --unionfs Include support for unionfs"	100	echo " --dracut-dir=<dir> Directory of Dracut sources; if given Dracut"
99	echo " --netboot Create a self-contained env in the initramfs"	101	echo " is run in local mode (see description of '-l'"
100	echo " --real-root=<foo> Specify a default for real_root="	102	echo " in 'man 8 dracut'); script changes current"
		103	echo " directory to <dir>, so don't use relative"
		104	echo " paths then"
		105	echo " --auto Rely on Dracut system check instead of"
		106	echo " specifying modules by hand"
		107	echo " --generic Build generic initramfs instead of"
		108	echo " default hostonly. Notice that generic => huge"
		109	echo " --mdraid Include RAID support via mdadm"
		110	echo " --gensplash Enable framebuffer splash (splashutils);"
		111	echo " set up in /etc/conf.d/splash"
		112	echo " --gensplash=<theme>[:<res>]"
		113	echo " Enable framebuffer splash using <theme>"
		114	echo " and optionally select splash theme resolutions"
		115	echo " to install; <res> is comma-separated list of"
		116	echo " resolutions"
		117	echo " --no-gensplash Do not install framebuffer splash"
		118	echo " --gensplash-no8bpp Ignore 8bpp gensplash images (can save a lot of"
		119	echo " space)"
		120	echo " --plymouth Enable EXPERIMENTAL Plymouth splash; set up"
		121	echo " configuration in /etc/plymouth/plymouthd.conf"
		122	echo " requires >=plymouth-0.8.3 to be installed"
		123	echo " --add-modules=<modules list>"
		124	echo " Additional Dracut modules;"
		125	echo " see /usr/share/dracut/modules.d for possible"
		126	echo " values; separate modules by space, e.g.:"
		127	echo " --add-modules=\"lvm crypt nfs\""
		128	echo " --extra-options=<options>"
		129	echo " Pass extra options to dracut;"
		130	echo " see 'man 8 dracut'"
101	echo " Internals"	131	echo " Internals"
102	echo " --arch-override=<arch> Force to arch instead of autodetect"	132	echo " --arch-override=<arch> Force to arch instead of autodetect"
103	echo " --cachedir=<dir> Override the default cache location"	133	echo " --cachedir=<dir> Override the default cache location"
Lines 152-157 usage() { Link Here
152	}	182	}
153		183
154	parse_cmdline() {	184	parse_cmdline() {
		185	local tmp
		186
155	case "$*" in	187	case "$*" in
156	--kernel-cc=*)	188	--kernel-cc=*)
157	CMD_KERNEL_CC=`parse_opt "$*"`	189	CMD_KERNEL_CC=`parse_opt "$*"`
Lines 215-239 parse_cmdline() { Link Here
215	CMD_BOOTDIR=`parse_opt "$*"`	247	CMD_BOOTDIR=`parse_opt "$*"`
216	print_info 2 "CMD_BOOTDIR: ${CMD_BOOTDIR}"	248	print_info 2 "CMD_BOOTDIR: ${CMD_BOOTDIR}"
217	;;	249	;;
218	--do-keymap-auto)
219	CMD_DOKEYMAPAUTO=1
220	CMD_KEYMAP=1
221	print_info 2 "CMD_DOKEYMAPAUTO: ${CMD_DOKEYMAPAUTO}"
222	;;
223	--no-keymap)
224	CMD_KEYMAP=0
225	print_info 2 "CMD_KEYMAP: ${CMD_KEYMAP}"
226	;;
227	--evms)
228	CMD_EVMS=1
229	print_info 2 "CMD_EVMS: ${CMD_EVMS}"
230	;;
231	--evms2)
232	CMD_EVMS=1
233	print_info 2 "CMD_EVMS: ${CMD_EVMS}"
234	echo
235	print_warning 1 "Please use --evms, as --evms2 is deprecated."
236	;;
237	--lvm)	250	--lvm)
238	CMD_LVM=1	251	CMD_LVM=1
239	print_info 2 "CMD_LVM: ${CMD_LVM}"	252	print_info 2 "CMD_LVM: ${CMD_LVM}"
Lines 245-272 parse_cmdline() { Link Here
245	print_warning 1 "Please use --lvm, as --lvm2 is deprecated."	258	print_warning 1 "Please use --lvm, as --lvm2 is deprecated."
246	;;	259	;;
247	--mdadm)	260	--mdadm)
248	CMD_MDADM=1	261	if ! [[ "${CMD_DRACUT}" = '0' ]] && ! [[ $* =~ --no-dracut ]]; then
249	print_info 2 "CMD_MDADM: $CMD_MDADM"	262	CMD_MDRAID=1
250	;;	263	print_info 2 "CMD_MDRAID: $CMD_MDRAID"
251	--no-busybox)	264	echo
252	CMD_BUSYBOX=0	265	print_warning 1 "Please use --mdraid, as --mdadm is obsolete."
253	print_info 2 "CMD_BUSYBOX: ${CMD_BUSYBOX}"	266	else
254	;;	267	CMD_MDADM=1
255	--unionfs)	268	print_info 2 "CMD_MDADM: $CMD_MDADM"
256	CMD_UNIONFS=1	269	fi
257	print_info 2 "CMD_UNIONFS: ${CMD_UNIONFS}"
258	;;
259	--netboot)
260	CMD_NETBOOT=1
261	print_info 2 "CMD_NETBOOT: ${CMD_NETBOOT}"
262	;;
263	--real-root=*)
264	CMD_REAL_ROOT=`parse_opt "$*"`
265	print_info 2 "CMD_REAL_ROOT: ${CMD_REAL_ROOT}"
266	;;
267	--slowusb)
268	CMD_SLOWUSB=1
269	print_info 2 "CMD_SLOWUSB: ${CMD_SLOWUSB}"
270	;;	270	;;
271	--dmraid)	271	--dmraid)
272	if [ ! -e /usr/include/libdevmapper.h ]	272	if [ ! -e /usr/include/libdevmapper.h ]
Lines 355-400 parse_cmdline() { Link Here
355	print_info 2 "CMD_CLEAN: ${CMD_CLEAN}"	355	print_info 2 "CMD_CLEAN: ${CMD_CLEAN}"
356	print_info 2 "CMD_OLDCONFIG: ${CMD_OLDCONFIG}"	356	print_info 2 "CMD_OLDCONFIG: ${CMD_OLDCONFIG}"
357	;;	357	;;
358	--gensplash=*)
359	CMD_SPLASH=1
360	SPLASH_THEME=`parse_opt "$*"`
361	print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
362	print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
363	echo
364	print_warning 1 "Please use --splash, as --gensplash is deprecated."
365	;;
366	--gensplash)
367	CMD_SPLASH=1
368	SPLASH_THEME='default'
369	print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
370	echo
371	print_warning 1 "Please use --splash, as --gensplash is deprecated."
372	;;
373	--splash=*)
374	CMD_SPLASH=1
375	SPLASH_THEME=`parse_opt "$*"`
376	print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
377	print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
378	;;
379	--splash)
380	CMD_SPLASH=1
381	SPLASH_THEME='default'
382	print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
383	;;
384	--no-splash)
385	CMD_SPLASH=0
386	print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
387	;;
388	--gensplash-res=*)
389	SPLASH_RES=`parse_opt "$*"`
390	print_info 2 "SPLASH_RES: ${SPLASH_RES}"
391	echo
392	print_warning 1 "Please use --splash-res, as --gensplash-res is deprecated."
393	;;
394	--splash-res=*)
395	SPLASH_RES=`parse_opt "$*"`
396	print_info 2 "SPLASH_RES: ${SPLASH_RES}"
397	;;
398	--install)	358	--install)
399	CMD_NOINSTALL=0	359	CMD_NOINSTALL=0
400	print_info 2 "CMD_NOINSTALL: ${CMD_NOINSTALL}"	360	print_info 2 "CMD_NOINSTALL: ${CMD_NOINSTALL}"
Lines 407-416 parse_cmdline() { Link Here
407	CMD_NORAMDISKMODULES=1	367	CMD_NORAMDISKMODULES=1
408	print_info 2 "CMD_NORAMDISKMODULES: ${CMD_NORAMDISKMODULES}"	368	print_info 2 "CMD_NORAMDISKMODULES: ${CMD_NORAMDISKMODULES}"
409	;;	369	;;
410	--all-ramdisk-modules)
411	CMD_ALLRAMDISKMODULES=1
412	print_info 2 "CMD_ALLRAMDISKMODULES: ${CMD_ALLRAMDISKMODULES}"
413	;;
414	--callback=*)	370	--callback=*)
415	CMD_CALLBACK=`parse_opt "$*"`	371	CMD_CALLBACK=`parse_opt "$*"`
416	print_info 2 "CMD_CALLBACK: ${CMD_CALLBACK}/$*"	372	print_info 2 "CMD_CALLBACK: ${CMD_CALLBACK}/$*"
Lines 424-434 parse_cmdline() { Link Here
424	TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$	380	TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
425	print_info 2 "TMPDIR: ${TMPDIR}"	381	print_info 2 "TMPDIR: ${TMPDIR}"
426	print_info 2 "TEMP: ${TEMP}"	382	print_info 2 "TEMP: ${TEMP}"
427	;;	383	;;
428	--postclear)	384	--postclear)
429	CMD_POSTCLEAR=1	385	CMD_POSTCLEAR=1
430	print_info 2 "CMD_POSTCLEAR: ${CMD_POSTCLEAR}"	386	print_info 2 "CMD_POSTCLEAR: ${CMD_POSTCLEAR}"
431	;;	387	;;
432	--arch-override=*)	388	--arch-override=*)
433	CMD_ARCHOVERRIDE=`parse_opt "$*"`	389	CMD_ARCHOVERRIDE=`parse_opt "$*"`
434	print_info 2 "CMD_ARCHOVERRIDE: ${CMD_ARCHOVERRIDE}"	390	print_info 2 "CMD_ARCHOVERRIDE: ${CMD_ARCHOVERRIDE}"
Lines 497-510 parse_cmdline() { Link Here
497	CMD_INITRAMFS_OVERLAY=`parse_opt "$*"`	453	CMD_INITRAMFS_OVERLAY=`parse_opt "$*"`
498	print_info 2 "CMD_INITRAMFS_OVERLAY: ${CMD_INITRAMFS_OVERLAY}"	454	print_info 2 "CMD_INITRAMFS_OVERLAY: ${CMD_INITRAMFS_OVERLAY}"
499	;;	455	;;
500	--linuxrc=*)
501	CMD_LINUXRC=`parse_opt "$*"`
502	print_info 2 "CMD_LINUXRC: ${CMD_LINUXRC}"
503	;;
504	--busybox-config=*)
505	CMD_BUSYBOX_CONFIG=`parse_opt "$*"`
506	print_info 2 "CMD_BUSYBOX_CONFIG: ${CMD_BUSYBOX_CONFIG}"
507	;;
508	--genzimage)	456	--genzimage)
509	KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'	457	KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'
510	KERNEL_BINARY_2='arch/powerpc/boot/zImage.initrd'	458	KERNEL_BINARY_2='arch/powerpc/boot/zImage.initrd'
Lines 512-524 parse_cmdline() { Link Here
512	# ENABLE_PEGASOS_HACKS="yes"	460	# ENABLE_PEGASOS_HACKS="yes"
513	# print_info 2 "ENABLE_PEGASOS_HACKS: ${ENABLE_PEGASOS_HACKS}"	461	# print_info 2 "ENABLE_PEGASOS_HACKS: ${ENABLE_PEGASOS_HACKS}"
514	;;	462	;;
515	--disklabel)
516	CMD_DISKLABEL=1
517	print_info 2 "CMD_DISKLABEL: ${CMD_DISKLABEL}"
518	;;
519	--luks)	463	--luks)
520	CMD_LUKS=1	464	if ! [[ "${CMD_DRACUT}" = '0' ]] && ! [[ $* =~ --no-dracut ]]; then
521	print_info 2 "CMD_LUKS: ${CMD_LUKS}"	465	CMD_CRYPT=1
		466	print_info 2 "CMD_CRYPT: ${CMD_CRYPT}"
		467	echo
		468	print_warning 1 "Please use --crypt, as --luks is obsolete."
		469	else
		470	CMD_LUKS=1
		471	print_info 2 "CMD_LUKS: ${CMD_LUKS}"
		472	fi
522	;;	473	;;
523	--firmware)	474	--firmware)
524	CMD_FIRMWARE=1	475	CMD_FIRMWARE=1
Lines 541-546 parse_cmdline() { Link Here
541	--config=*)	492	--config=*)
542	print_info 2 "CMD_GK_CONFIG: `parse_opt "$*"`"	493	print_info 2 "CMD_GK_CONFIG: `parse_opt "$*"`"
543	;;	494	;;
		495	--local)
		496	;;
		497
		498	# Internal engine
		499	--no-busybox)
		500	CMD_BUSYBOX=0
		501	print_info 2 "CMD_BUSYBOX: ${CMD_BUSYBOX}"
		502	;;
		503	--unionfs)
		504	CMD_UNIONFS=1
		505	print_info 2 "CMD_UNIONFS: ${CMD_UNIONFS}"
		506	;;
		507	--netboot)
		508	CMD_NETBOOT=1
		509	print_info 2 "CMD_NETBOOT: ${CMD_NETBOOT}"
		510	;;
		511	--real-root=*)
		512	CMD_REAL_ROOT=`parse_opt "$*"`
		513	print_info 2 "CMD_REAL_ROOT: ${CMD_REAL_ROOT}"
		514	;;
		515	--slowusb)
		516	CMD_SLOWUSB=1
		517	print_info 2 "CMD_SLOWUSB: ${CMD_SLOWUSB}"
		518	;;
		519	--do-keymap-auto)
		520	CMD_DOKEYMAPAUTO=1
		521	CMD_KEYMAP=1
		522	print_info 2 "CMD_DOKEYMAPAUTO: ${CMD_DOKEYMAPAUTO}"
		523	;;
		524	--no-keymap)
		525	CMD_KEYMAP=0
		526	print_info 2 "CMD_KEYMAP: ${CMD_KEYMAP}"
		527	;;
		528	--evms)
		529	CMD_EVMS=1
		530	print_info 2 "CMD_EVMS: ${CMD_EVMS}"
		531	;;
		532	--evms2)
		533	CMD_EVMS=1
		534	print_info 2 "CMD_EVMS: ${CMD_EVMS}"
		535	echo
		536	print_warning 1 "Please use --evms, as --evms2 is deprecated."
		537	;;
		538	--disklabel)
		539	CMD_DISKLABEL=1
		540	print_info 2 "CMD_DISKLABEL: ${CMD_DISKLABEL}"
		541	;;
		542	--all-ramdisk-modules)
		543	CMD_ALLRAMDISKMODULES=1
		544	print_info 2 "CMD_ALLRAMDISKMODULES: ${CMD_ALLRAMDISKMODULES}"
		545	;;
		546	--linuxrc=*)
		547	CMD_LINUXRC=`parse_opt "$*"`
		548	print_info 2 "CMD_LINUXRC: ${CMD_LINUXRC}"
		549	;;
		550	--busybox-config=*)
		551	CMD_BUSYBOX_CONFIG=`parse_opt "$*"`
		552	print_info 2 "CMD_BUSYBOX_CONFIG: ${CMD_BUSYBOX_CONFIG}"
		553	;;
		554	--splash=*)
		555	CMD_SPLASH=1
		556	SPLASH_THEME=`parse_opt "$*"`
		557	print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
		558	print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
559	;;
560	--splash)
561	CMD_SPLASH=1
562	SPLASH_THEME='default'
563	print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
564	;;
565	--no-splash)
566	CMD_SPLASH=0
567	print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
568	;;
569	--splash-res=*)
570	SPLASH_RES=`parse_opt "$*"`
571	print_info 2 "SPLASH_RES: ${SPLASH_RES}"
572	;;
573
574	# Dracut engine
575	--no-dracut)
576	CMD_DRACUT=0
577	print_info 2 "CMD_DRACUT: ${CMD_DRACUT}"
578	;;
579	--dracut-dir=*)
580	CMD_DRACUT_DIR=`parse_opt "$*"`
581	print_info 2 "CMD_DRACUT_DIR: ${CMD_DRACUT_DIR}"
582	;;
583	--auto)
584	CMD_AUTO=1
585	print_info 2 "CMD_AUTO: ${CMD_AUTO}"
586	;;
587	--generic)
588	CMD_GENERIC=1
589	print_info 2 "CMD_GENERIC: ${CMD_GENERIC}"
590	;;
591	--mdraid)
592	CMD_MDRAID=1
593	print_info 2 "CMD_MDRAID: ${CMD_MDRAID}"
594	;;
595	--crypt)
596	CMD_CRYPT=1
597	print_info 2 "CMD_CRYPT: ${CMD_CRYPT}"
598	;;
599	--gensplash)
600	CMD_GENSPLASH=1
601	print_info 2 "CMD_GENSPLASH: ${CMD_GENSPLASH}"
602	;;
603	--gensplash=*)
604	CMD_GENSPLASH=1
605	tmp=`parse_opt "$*"`
606	GENSPLASH_THEME=${tmp%%:*}
607	print_info 2 "GENSPLASH: ${GENSPLASH}"
608	print_info 2 "GENSPLASH_THEME: ${GENSPLASH_THEME}"
609	[[ ${tmp} =~ : ]] && {
610	GENSPLASH_RES=${tmp#*:}
611	print_info 2 "GENSPLASH_RES: ${GENSPLASH_RES}"
612	}
613	;;
614	--plymouth)
615	CMD_PLYMOUTH=1
616	print_info 2 "CMD_PLYMOUTH: ${CMD_PLYMOUTH}"
617	;;
618	--add-modules=*)
619	CMD_ADD_MODULES=`parse_opt "$*"`
620	print_info 2 "CMD_ADD_MODULES: ${CMD_ADD_MODULES}"
621	;;
622	--extra-options=*)
623	CMD_EXTRA_OPTIONS=`parse_opt "$*"`
624	print_info 2 "CMD_EXTRA_OPTIONS: ${CMD_EXTRA_OPTIONS}"
625	;;
626
544	all)	627	all)
545	BUILD_KERNEL=1	628	BUILD_KERNEL=1
546	BUILD_MODULES=1	629	BUILD_MODULES=1

Line 0 Link Here

(-)a/gen_dracut.sh (+84 lines)
		1	#!/bin/bash
		2	# $Id$
		3
		4	BASIC_MODULES=dash\ i18n\ kernel-modules\ resume\ rootfs-block\ terminfo
		5	BASIC_MODULES+=\ udev-rules\ uswsusp\ base
		6	MODULES=lvm\ dmraid\ iscsi\ mdraid\ crypt\ multipath\ plymouth\ gensplash
		7
		8	dracut_modules() {
		9	local a=() o=()
		10
		11	isTrue "${PLYMOUTH}" && isTrue "${GENSPLASH}" && gen_die 'Gentoo Splash and Plymouth selected! You cannot choose both splash engines.'
		12	isTrue "${EVMS}" && gen_die 'EVMS is no longer supported. If you really need it, file a bug report and we bring it back to life.'
		13	isTrue "${UNIONFS}" && gen_die 'UnionFS not yet supported.'
		14
		15	for var in ${MODULES}
		16	do
		17	var="${var^^}"
		18	isTrue "${!var}" && a+=(${var,,})
		19	done
		20
		21	a+=(${ADD_MODULES})
		22
		23	! isTrue "${AUTO}" && echo -n "-m '${BASIC_MODULES}'"
		24	[[ ${a[]} ]] && echo -n " -a '${a[]}'"
		25	[[ ${o[]} ]] && echo -n " -o '${o[]}'"
		26	}
		27
		28	create_initramfs() {
		29	local tmprd="${TMPDIR}/initramfs-${KV}" opts='-f -v' add_files=()
		30
		31	print_info 1 'initramfs: >> Initializing Dracut...'
		32
		33	if isTrue "${GENERIC}"
		34	then
		35	print_info 1 ' >> Will build generic (read: huge) initramfs'
		36	else
		37	opts+=\ -H
		38	fi
		39
		40	if isTrue "${NORAMDISKMODULES}"
		41	then
		42	print_info 1 ' >> Not copying kernel modules and firmware...'
		43	opts+=\ --ignore-kernel-modules
		44	else
		45	isTrue "${FIRMWARE}" && opts+=" --fwdir ${FIRMWARE_DIR}"
		46	[[ ${FIRMWARE_FILES} ]] && add_files+=(${FIRMWARE_FILES})
		47	fi
		48
		49	[[ ${DRACUT_DIR} ]] && opts="-l ${opts}"
		50	[[ ${INITRAMFS_OVERLAY} ]] && opts+=" ${INITRAMFS_OVERLAY} /"
		51	[[ ${add_files[]} ]] && opts+=" -I '${add_files[]}'"
		52	opts+=" ${EXTRA_OPTIONS}"
		53	opts+=" $(dracut_modules)"
		54
		55	export DRACUT_GENSPLASH_THEME=${GENSPLASH_THEME}
		56	export DRACUT_GENSPLASH_RES=${GENSPLASH_RES}
		57	print_info 1 " >> DRACUT_GENSPLASH_THEME=${GENSPLASH_THEME}"
		58	print_info 1 " >> DRACUT_GENSPLASH_RES=${GENSPLASH_RES}"
		59	print_info 1 " >> dracut ${opts} '${tmprd}' '${KV}'"
		60	if [[ ${DRACUT_DIR} ]]; then
		61	cd "${DRACUT_DIR}"
		62	eval ./dracut ${opts} \'${tmprd}\' \'${KV}\'
		63	cd - >/dev/null
		64	else
65	eval dracut ${opts} \'${tmprd}\' \'${KV}\'
66	fi
67
68	if isTrue "${INTEGRATED_INITRAMFS}"
69	then
70	mv ${tmprd} ${tmprd}.cpio.gz
71	sed -i '/^.CONFIG_INITRAMFS_SOURCE=.$/d' ${KERNEL_DIR}/.config
72	echo -e "CONFIG_INITRAMFS_SOURCE=\"${tmprd}.cpio.gz\"\nCONFIG_INITRAMFS_ROOT_UID=0\nCONFIG_INITRAMFS_ROOT_GID=0" \
73	>> ${KERNEL_DIR}/.config
74	fi
75
76	if ! isTrue "${CMD_NOINSTALL}"
77	then
78	if ! isTrue "${INTEGRATED_INITRAMFS}"
79	then
80	copy_image_with_preserve initramfs "${tmprd}" \
81	"initramfs-${KNAME}-${ARCH}-${KV}"
82	fi
83	fi
84	}

Lines 53-69 USECOLOR="yes" Link Here

(-)a/genkernel.conf (-11 / +20 lines)
53	# compile static LVM binaries if static ones do not exist.	53	# compile static LVM binaries if static ones do not exist.
54	# LVM="no"	54	# LVM="no"
55		55
56	# Add in EVMS support from static binaries if they exist on the system: you
57	# should run "emerge evms" first.
58	# EVMS="no"
59
60	# Add DMRAID support.	56	# Add DMRAID support.
61	# DMRAID="no"	57	# DMRAID="no"
62		58
63	# Include (or suppresses the inclusion of) busybox in the initrd or initramfs.
64	# If included, busybox is rebuilt if the cached copy is out of date.
65	# BUSYBOX="yes"
66
67	# Copy /etc/mdadm.conf to initramfs.	59	# Copy /etc/mdadm.conf to initramfs.
68	# MDADM="no"	60	# MDADM="no"
69		61
Lines 80-90 USECOLOR="yes" Link Here
80	# Specify specific firmware files to include. This overrides FIRMWARE_DIR	72	# Specify specific firmware files to include. This overrides FIRMWARE_DIR
81	# FIRMWARE_FILES=""	73	# FIRMWARE_FILES=""
82		74
		75	# Add new kernel to grub?
		76	# BOOTLOADER="grub"
		77
		78	# ==============Internal engine===============
		79	#
83	# Enable disklabel support (copies blkid to initrd)	80	# Enable disklabel support (copies blkid to initrd)
84	DISKLABEL="yes"	81	DISKLABEL="yes"
85		82
86	# Add new kernel to grub?	83	# Include (or suppresses the inclusion of) busybox in the initrd or initramfs.
87	# BOOTLOADER="grub"	84	# If included, busybox is rebuilt if the cached copy is out of date.
		85	# BUSYBOX="yes"
		86
		87	# Add in EVMS support from static binaries if they exist on the system: you
		88	# should run "emerge evms" first.
		89	# EVMS="no"
		90
		91	# ===============Dracut engine================
		92
		93	# Build system using Dracut [yes] or old internal engine [no]. "yes" is default.
		94	# DRACUT="yes"
		95
		96	# Include RAID support via mdadm
		97	# MDRAID="no"
88		98
89	# =========Low Level Compile Settings=========	99	# =========Low Level Compile Settings=========
90	#	100	#
91	-