Changeset c91c9fb in mainline

Timestamp:

2009-03-02T17:26:01Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

926d6caf

Parents:

6cef75da

Message:

remove console_wait() (this will be moved to libc)
mount only a single root filesystem, use IPC_FLAG_BLOCKING

File:

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

uspace/app/init/init.c

@@ -28 +28 @@
 
 /** @addtogroup init Init
- * @brief       Init process for testing purposes.
+ * @brief Init process for user space environment configuration.
  * @{
- */ 
+ */
 /**
  * @file
@@ -37 +37 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <ipc/ipc.h>
 #include <vfs/vfs.h>
 #include <bool.h>
@@ -43 +44 @@
 #include <task.h>
 #include <malloc.h>
+#include <macros.h>
 #include "init.h"
 #include "version.h"
-
-static void console_wait(void)
-{
-        while (get_cons_phone() < 0)
-                usleep(50000);  // FIXME
-}
 
 static bool mount_fs(const char *fstype)
@@ -57 +53 @@
         
         while (rc < 0) {
-                rc = mount(fstype, "/", "initrd");
-
+                rc = mount(fstype, "/", "initrd", IPC_FLAG_BLOCKING);
+                
                 switch (rc) {
                 case EOK:
@@ -72 +68 @@
                         printf(NAME ": Unknown filesystem type (%s)\n", fstype);
                         return false;
-                default:
-                        sleep(5);       // FIXME
                 }
         }
@@ -83 +77 @@
 {
         char *argv[2];
-
+        
         printf(NAME ": Spawning %s\n", fname);
-
+        
         argv[0] = fname;
         argv[1] = NULL;
-
-        if (task_spawn(fname, argv) != 0) {
-                /* Success */
-                sleep(1);
-        }
+        
+        if (task_spawn(fname, argv))
+                /* Add reasonable delay to avoid
+                   intermixed klog output */
+                usleep(10000);
+        else
+                printf(NAME ": Error spawning %s\n", fname);
 }
 
@@ -98 +94 @@
 {
         info_print();
-        sleep(5);       // FIXME
         
-        if (!mount_fs("tmpfs") && !mount_fs("fat")) {
+        if (!mount_fs(STRING(RDFMT))) {
                 printf(NAME ": Exiting\n");
                 return -1;