Attachment #126048 for bug #186652

Lines 2-7 Link Here

(-)a/ChangeLog (+7 lines)
2	# Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2	2	# Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
3	# $Header: $	3	# $Header: $
4		4
		5	24 Jul 2007; Robin H. Johnson <robbat2@gentoo.org> gen_determineargs.sh,
		6	genkernel, genkernel.conf:
		7	Add customized modules_load support. This allows users to specify exactly
		8	which modules to include in the initramfs for their system. They must
		9	remember to include dependancy modules themselves! (Eg sata_* depend on
		10	libata).
		11
5	24 Jul 2007; Robin H. Johnson <robbat2@gentoo.org> generic/initrd.scripts,	12	24 Jul 2007; Robin H. Johnson <robbat2@gentoo.org> generic/initrd.scripts,
6	generic/linuxrc:	13	generic/linuxrc:
7	The previous patch from bug #174294 still contained some bugs in the linuxrc	14	The previous patch from bug #174294 still contained some bugs in the linuxrc

Lines 214-219 determine_real_args() { Link Here

(-)a/gen_determineargs.sh (+1 lines)
214	SUSPEND_BINCACHE=`cache_replace "${SUSPEND_BINCACHE}"`	214	SUSPEND_BINCACHE=`cache_replace "${SUSPEND_BINCACHE}"`
215		215
216	DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"`	216	DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"`
		217	MODULES_CONFIG=`arch_replace "${MODULES_CONFIG}"`
217	BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"`	218	BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"`
218	BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"`	219	BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"`
219	MODULE_INIT_TOOLS_BINCACHE=`arch_replace "${MODULE_INIT_TOOLS_BINCACHE}"`	220	MODULE_INIT_TOOLS_BINCACHE=`arch_replace "${MODULE_INIT_TOOLS_BINCACHE}"`

Lines 84-90 get_official_arch Link Here

(-)a/genkernel (-1 / +1 lines)
84		84
85	# Read arch-specific config	85	# Read arch-specific config
86	source ${ARCH_CONFIG} \|\| gen_die "Could not read ${ARCH_CONFIG}"	86	source ${ARCH_CONFIG} \|\| gen_die "Could not read ${ARCH_CONFIG}"
87	source ${GK_SHARE}/${ARCH}/modules_load \|\| gen_die "Could not read ${GK_SHARE}/${ARCH}/modules_load"	87	source ${MODULES_CONFIG} \|\| gen_die "Could not read ${MODULES_CONFIG}"
88		88
89	# Merge modules_load from config	89	# Merge modules_load from config
90	for group_modules in ${!AMODULES_*}; do	90	for group_modules in ${!AMODULES_*}; do

Lines 92-97 BUSYBOX_SRCTAR="${GK_SHARE}/pkg/busybox-${BUSYBOX_VER}.tar.bz2" Link Here

(-)a/genkernel.conf (-1 / +5 lines)
92	# Directory created after busybox tarball is extracted	92	# Directory created after busybox tarball is extracted
93	BUSYBOX_DIR="busybox-${BUSYBOX_VER}"	93	BUSYBOX_DIR="busybox-${BUSYBOX_VER}"
94		94
		95	MODULES_CONFIG="${GK_SHARE}/%%ARCH%%/modules_load"
		96	# If you wanted a totally custom modules_load, copy the relevant
		97	# arch file to the following line and uncomment it.
		98	#MODULES_CONFIG="/etc/genkernel/modules_load"
		99
95	MODULE_INIT_TOOLS_VER="0.9.15-pre4"	100	MODULE_INIT_TOOLS_VER="0.9.15-pre4"
96	MODULE_INIT_TOOLS_SRCTAR="${GK_SHARE}/pkg/module-init-tools-${MODULE_INIT_TOOLS_VER}.tar.bz2"	101	MODULE_INIT_TOOLS_SRCTAR="${GK_SHARE}/pkg/module-init-tools-${MODULE_INIT_TOOLS_VER}.tar.bz2"
97	MODULE_INIT_TOOLS_DIR="module-init-tools-${MODULE_INIT_TOOLS_VER}"	102	MODULE_INIT_TOOLS_DIR="module-init-tools-${MODULE_INIT_TOOLS_VER}"
98	-

Return to bug 186652