Changeset 8b655705 in mainline for uspace/app/init/init.c

Timestamp:

2011-04-15T19:38:07Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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 mainline changes.

File:

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

uspace/app/init/init.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <unistd.h>
-#include <ipc/ipc.h>
 #include <vfs/vfs.h>
 #include <bool.h>
@@ -273 +272 @@
         mount_tmpfs();
         
+#ifdef CONFIG_START_DEVMAN
+        spawn("/srv/devman");
+#endif
         spawn("/srv/apic");
         spawn("/srv/i8259");