From fac18ddab176b8171c7942b68fc01ab3120207ac Mon Sep 17 00:00:00 2001 From: Robin H. Johnson Date: Tue, 24 Jul 2007 23:51:21 -0700 Subject: [PATCH genkernel 2/4] Add customized modules_load support. This allows users to specify exactly which modules to include in the initramfs for their system. They must remember to include dependancy modules themselves! (Eg sata_* depend on libata). --- ChangeLog | 7 +++++++ gen_determineargs.sh | 1 + genkernel | 2 +- genkernel.conf | 5 +++++ 4 files changed, 14 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1e23d1..b84f491 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,13 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 24 Jul 2007; Robin H. Johnson gen_determineargs.sh, + genkernel, genkernel.conf: + Add customized modules_load support. This allows users to specify exactly + which modules to include in the initramfs for their system. They must + remember to include dependancy modules themselves! (Eg sata_* depend on + libata). + 24 Jul 2007; Robin H. Johnson generic/initrd.scripts, generic/linuxrc: The previous patch from bug #174294 still contained some bugs in the linuxrc diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 02042c1..1cfedbc 100644 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -214,6 +214,7 @@ determine_real_args() { SUSPEND_BINCACHE=`cache_replace "${SUSPEND_BINCACHE}"` DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"` + MODULES_CONFIG=`arch_replace "${MODULES_CONFIG}"` BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"` BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"` MODULE_INIT_TOOLS_BINCACHE=`arch_replace "${MODULE_INIT_TOOLS_BINCACHE}"` diff --git a/genkernel b/genkernel index 4b45e32..1edfd1e 100755 --- a/genkernel +++ b/genkernel @@ -84,7 +84,7 @@ get_official_arch # Read arch-specific config source ${ARCH_CONFIG} || gen_die "Could not read ${ARCH_CONFIG}" -source ${GK_SHARE}/${ARCH}/modules_load || gen_die "Could not read ${GK_SHARE}/${ARCH}/modules_load" +source ${MODULES_CONFIG} || gen_die "Could not read ${MODULES_CONFIG}" # Merge modules_load from config for group_modules in ${!AMODULES_*}; do diff --git a/genkernel.conf b/genkernel.conf index 546d606..67defaf 100755 --- a/genkernel.conf +++ b/genkernel.conf @@ -92,6 +92,11 @@ BUSYBOX_SRCTAR="${GK_SHARE}/pkg/busybox-${BUSYBOX_VER}.tar.bz2" # Directory created after busybox tarball is extracted BUSYBOX_DIR="busybox-${BUSYBOX_VER}" +MODULES_CONFIG="${GK_SHARE}/%%ARCH%%/modules_load" +# If you wanted a totally custom modules_load, copy the relevant +# arch file to the following line and uncomment it. +#MODULES_CONFIG="/etc/genkernel/modules_load" + MODULE_INIT_TOOLS_VER="0.9.15-pre4" MODULE_INIT_TOOLS_SRCTAR="${GK_SHARE}/pkg/module-init-tools-${MODULE_INIT_TOOLS_VER}.tar.bz2" MODULE_INIT_TOOLS_DIR="module-init-tools-${MODULE_INIT_TOOLS_VER}" -- 1.5.2.4