Changeset 291b8bc in mainline for uspace/app/init/init.c

Timestamp:

2011-03-26T13:28:43Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f62468c

Parents:

889e8e3 (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 development/ changes

File:

• uspace/app/init/init.c (modified) (2 diffs)

uspace/app/init/init.c

@@ -288 +288 @@
         
         spawn("/srv/clip");
-
-#ifdef CONFIG_DEVMAN_EARLY_LAUNCH
-        spawn("/srv/devman");
-#endif
         
         /*
@@ -318 +314 @@
         getterm("term/vc6", "/app/klog", false);
 
-#ifndef CONFIG_DEVMAN_EARLY_LAUNCH
+#ifdef CONFIG_DEVMAN_EARLY_LAUNCH
+        spawn("/srv/devman");
+#else
         getterm("term/vc7", "/srv/devman", false);
 #endif