Changeset 15210

Timestamp:

09/16/10 09:24:45 (3 years ago)

Author:

eko

Message:

fix for console init deadlock on micro builds without serial enabled in kernel.

File:

• src/router/rc/init.c (modified) (2 diffs)

src/router/rc/init.c

@@ -395 +395 @@
          * Basic initialization 
          */
+#ifdef HAVE_MICRO
+        if (console_init())
+                noconsole = 1;
+#endif
         cprintf("init lcd\n");
         initlcd();
@@ -403 +407 @@
         start_service("devinit"); //init /dev /proc etc.
         start_service("sysinit");
+#ifndef HAVE_MICRO
 #ifndef HAVE_LAGUNA
         if (console_init())
 #endif
                 noconsole = 1;
+#endif  //HAVE_MICRO
         start_service("drivers");
         cprintf("setup signals\n");