From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Tue, 13 Nov 2007 23:05:27 +0000 (+0000)
Subject: Added config defaulting for --mdadm for bug #198694.  Thanks to John R. Graham <john_... 
X-Git-Tag: v3.4.10.902~193
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dfdb2b91ae13cf6d81742cdf19b72bf5154faae3;p=genkernel.git

Added config defaulting for --mdadm for bug #198694.  Thanks to John R. Graham <john_r_graham@mindspring.com> for providing the patch.  This is 3.4.9_pre9 for testing.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@559 67a159dc-881f-0410-a524-ba9dfbe2cb84
---

diff --git a/ChangeLog b/ChangeLog
index 77bddd2..af15cc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,14 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_determineargs.sh,
+  genkernel.conf:
+  Added config defaulting for --mdadm for bug #198694. Thanks to John R.
+  Graham <john_r_graham@mindspring.com> for providing the patch. This is
+  3.4.9_pre9 for testing.
+
   08 Nov 2007; Andrew Gaffney <agaffney@gentoo.org> gen_arch.sh:
-  revert patch from bug 190327
+  Revert patch from bug 190327 as it breaks well more than it fixed.
 
   07 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/config.sh,
   gen_cmdline.sh, gen_determineargs.sh, gen_funcs.sh, gen_initramfs.sh,
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 3160462..69df5ee 100644
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -116,6 +116,7 @@ determine_real_args() {
 	
 	set_config_with_override 1 DISKLABEL            CMD_DISKLABEL
 	set_config_with_override 1 LUKS                 CMD_LUKS
+	set_config_with_override 1 MDADM                CMD_MDADM
 
 		BOOTDIR=`arch_replace "${BOOTDIR}"`
 		BOOTDIR=${BOOTDIR%/}    # Remove any trailing slash
@@ -203,13 +204,6 @@ determine_real_args() {
 		mkdir -p `dirname ${KERNCACHE}`
 	fi
 	
-	if isTrue "${CMD_MDADM}"
-	then
-		MDADM=1
-	else
-		MDADM=0
-	fi
-
 	get_KV
 	UNIONFS_MODULES_BINCACHE=`kv_replace "${UNIONFS_MODULES_BINCACHE}"`
 }
diff --git a/genkernel.conf b/genkernel.conf
index b405b6a..4807362 100755
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -69,9 +69,13 @@ USECOLOR="yes"
 # 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,
+# If included, busybox is rebuilt if the cached copy is out of date.
 # BUSYBOX="yes"
 
+# Copy /etc/mdadm.conf to initramfs.
+# MDADM="no"
+
+
 # =========Low Level Compile Settings=========
 #
 # GNU Make to use for kernel.  See also the --kernel-make command line option.