1 files changed, 64 insertions, 0 deletions

diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.27/0030-fastboot-retry-mounting-the-root-fs-if-we-can-t-fin.patch b/meta-moblin/packages/linux/linux-moblin-2.6.27/0030-fastboot-retry-mounting-the-root-fs-if-we-can-t-fin.patch
new file mode 100644
index 0000000000..0e0c7fa84f
--- /dev/null
+++ b/meta-moblin/packages/linux/linux-moblin-2.6.27/0030-fastboot-retry-mounting-the-root-fs-if-we-can-t-fin.patch
@@ -0,0 +1,64 @@
+From db62cd29f9b9142c19c574ca00916f66ff22ed4a Mon Sep 17 00:00:00 2001
+From: Arjan van de Ven <arjan@linux.intel.com>
+Date: Sun, 20 Jul 2008 13:01:28 -0700
+Subject: [PATCH] fastboot: retry mounting the root fs if we can't find init
+
+currently we wait until all device init is done before trying to mount
+the root fs, and to consequently execute init.
+
+In preparation for relaxing the first delay, this patch adds a retry
+attempt in case /sbin/init is not found. Before retrying, the code
+will wait for all device init to complete.
+
+While this patch by itself doesn't gain boot time yet (it needs follow on
+patches), the alternative already is to panic()...
+
+Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
+---
+ init/main.c |   19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+Index: linux-2.6.27/init/main.c
+===================================================================
+--- linux-2.6.27.orig/init/main.c       2008-10-14 17:01:48.000000000 +0200
++++ linux-2.6.27/init/main.c    2008-10-14 17:02:42.000000000 +0200
+@@ -845,6 +845,7 @@ static void run_init_process(char *init_
+  */
+ static int noinline init_post(void)
+ {
++       int retry_count = 1;
+        free_initmem();
+        unlock_kernel();
+        mark_rodata_ro();
+@@ -865,6 +866,7 @@ static int noinline init_post(void)
+                                ramdisk_execute_command);
+        }
+ 
++retry:
+        /*
+         * We try each of these until one succeeds.
+         *
+@@ -877,6 +879,23 @@ static int noinline init_post(void)
+                                        "defaults...\n", execute_command);
+        }
+        run_init_process("/sbin/init");
++
++       if (retry_count > 0) {
++               retry_count--;
++               /*
++                * We haven't found init yet... potentially because the device
++                * is still being probed. We need to
++                * - flush keventd and friends
++                * - wait for the known devices to complete their probing
++                * - try to mount the root fs again
++                */
++               flush_scheduled_work();
++               while (driver_probe_done() != 0)
++                       msleep(100);
++               prepare_namespace();
++               goto retry;
++       }
++
+        run_init_process("/etc/init");
+        run_init_process("/bin/init");
+        run_init_process("/bin/sh");