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

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 29a1832b95d45cb0dc2080ed71b71a4ee73f7f54..7a968297c69024b0166b928bc82134342104299c 100644 (file)
--- 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 83b3c048cbf80b76664ef61326a5ba58659b880a..a06052308bd50d4a1a821a778a15340fd3601add 100644 (file)
--- 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 1cd0c91ccb7a3644ac045c2f938e801bf81201fa..7087227ff82d61c201c35b6e8e924e2614b00f18 100644 (file)
--- 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