Changeset aee6c73 in mainline for uspace/app/init

Timestamp:

2011-03-26T17:19:28Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0368669c, cee51fd

Parents:

f3da9b2 (diff), c9f5e238 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from development

File:

• uspace/app/init/init.c (modified) (1 diff)

uspace/app/init/init.c

@@ -313 +313 @@
         getterm("term/vc5", "/app/bdsh", false);
         getterm("term/vc6", "/app/klog", false);
+
+#ifdef CONFIG_DEVMAN_EARLY_LAUNCH
+        spawn("/srv/devman");
+#else
         getterm("term/vc7", "/srv/devman", false);
-        
+#endif
+
         return 0;
 }