Changeset 1735f3e in mainline for uspace/app/init/init.c

Timestamp:

2010-01-31T18:22:37Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fc2e71e

Parents:

430de97 (diff), 2e07f62c (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 mainline.

File:

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

uspace/app/init/init.c

@@ -233 +233 @@
 }
 
+static void mount_scratch(void)
+{
+        int rc;
+
+        printf("Trying to mount null/0 on /scratch... ");
+        fflush(stdout);
+
+        rc = mount("tmpfs", "/scratch", "null/0", "", 0);
+        if (rc == EOK)
+                printf("OK\n");
+        else
+                printf("Failed\n");
+}
+
 static void mount_data(void)
 {
@@ -255 +269 @@
                 return -1;
         }
+
+        /* Make sure tmpfs is running. */
+        if (str_cmp(STRING(RDFMT), "tmpfs") != 0) {
+                spawn("/srv/tmpfs");
+        }
         
         spawn("/srv/devfs");
+        spawn("/srv/taskmon");
         
         if (!mount_devfs()) {
@@ -262 +282 @@
                 return -2;
         }
+
+        mount_scratch();
         
         spawn("/srv/fhc");
         spawn("/srv/obio");
+        srv_start("/srv/cuda_adb");
         srv_start("/srv/i8042");
-        srv_start("/srv/c_mouse");
+        srv_start("/srv/adb_ms");
+        srv_start("/srv/char_ms");
 
         spawn("/srv/fb");
@@ -298 +322 @@
         getterm("term/vc5", "/app/bdsh");
         getterm("term/vc6", "/app/klog");
-        
+
         return 0;
 }