From: Eric Edgar <rocket@gentoo.org>
Date: Mon, 11 Jul 2005 16:02:15 +0000 (+0000)
Subject: remove extra make prepare in gen_determineargs.sh that breaks things.  Fix md /dev... 
X-Git-Tag: v3.4.10.902~506
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a33e43575c5358c2efc3cc8535d6882d83fbe6a;p=genkernel.git

remove extra make prepare in gen_determineargs.sh that breaks things.  Fix md /dev creation bug 98193


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

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 29a1832..7a96829 100644
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -39,7 +39,7 @@ get_KV() {
 		if [ "${PAT}" -gt '4' -a -e ${KERNEL_DIR}/.config ]
 		then
 			cd ${KERNEL_DIR}
-			compile_generic prepare kernel > /dev/null 2>&1
+			#compile_generic prepare kernel > /dev/null 2>&1
 			cd - > /dev/null 2>&1
 			if [ -f ${KERNEL_DIR}/include/linux/version.h ]
 			then
diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 83b3c04..a060523 100644
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -491,6 +491,27 @@ cdupdate() {
     	fi
 }
 
+setup_md_device(){
+	MAJOR=9
+
+	if [ `echo ${REAL_ROOT}|sed -e 's#\(/dev/md\)[[:digit:]]\+#\1#'` = "/dev/md" ]
+	then
+    		good_msg "real_root is a md device. Setting up the device node (If necessary) ..."
+    		MD_NUMBER=`echo ${REAL_ROOT}|sed -e 's#/dev/md\([[:digit:]]\+\)#\1#'`
+    		if [ ! -e /dev/md${MD_NUMBER} ]
+    		then
+        		mknod /dev/md${MD_NUMBER} b ${MAJOR} ${MD_NUMBER} >/dev/null 2>&1
+			ret=$?
+			if [ "${ret}" -ne 0 ]
+			then
+				bad_msg "Creation of /dev/md${MD_NUMBER} failed... "
+			else
+				good_msg "Creation of /dev/md${MD_NUMBER} Succeeded... "
+			fi
+        	fi
+    	fi
+}
+
 rundebugshell(){
     if [ -n "$DEBUG" ]; then
 	good_msg 'Starting debug shell as requested by "debug" option.'
diff --git a/generic/linuxrc b/generic/linuxrc
index 1cd0c91..7087227 100644
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -177,6 +177,9 @@ mount_sysfs
 # Start udev/devfs
 start_dev_mgr
 
+# Setup md device nodes if they dont exist
+setup_md_device
+
 # Start EVMS
 startVolumes