Changes in uspace/app/init/init.c [28be7fa:8e33e1d] in mainline

File:

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

uspace/app/init/init.c

@@ -94 +94 @@
 static bool mount_devfs(void)
 {
-        int rc = mount("devfs", DEVFS_MOUNT_POINT, "", "", IPC_FLAG_BLOCKING);
+        char null[MAX_DEVICE_NAME];
+        int null_id = devmap_null_create();
+        
+        if (null_id == -1) {
+                printf(NAME ": Unable to create null device\n");
+                return false;
+        }
+        
+        snprintf(null, MAX_DEVICE_NAME, "null/%d", null_id);
+        int rc = mount("devfs", DEVFS_MOUNT_POINT, null, "", IPC_FLAG_BLOCKING);
         
         switch (rc) {
@@ -102 +111 @@
         case EBUSY:
                 printf(NAME ": Device filesystem already mounted\n");
+                devmap_null_destroy(null_id);
                 return false;
         case ELIMIT:
                 printf(NAME ": Unable to mount device filesystem\n");
+                devmap_null_destroy(null_id);
                 return false;
         case ENOENT:
                 printf(NAME ": Unknown filesystem type (devfs)\n");
+                devmap_null_destroy(null_id);
                 return false;
         default:
                 printf(NAME ": Error mounting device filesystem (%d)\n", rc);
+                devmap_null_destroy(null_id);
                 return false;
         }
@@ -171 +184 @@
 {
         char *argv[3];
-        char hid_in[DEVMAP_NAME_MAXLEN];
+        char hid_in[MAX_DEVICE_NAME];
         int rc;
         
-        snprintf(hid_in, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
+        snprintf(hid_in, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
         
         printf(NAME ": Spawning %s with %s\n", SRV_CONSOLE, hid_in);
@@ -196 +209 @@
 {
         char *argv[4];
-        char term[DEVMAP_NAME_MAXLEN];
+        char term[MAX_DEVICE_NAME];
         int rc;
         
-        snprintf(term, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
+        snprintf(term, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
         
         printf(NAME ": Spawning %s with %s %s\n", APP_GETTERM, term, app);
@@ -220 +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)
 {
@@ -256 +255 @@
                 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()) {
@@ -269 +262 @@
                 return -2;
         }
-
-        mount_scratch();
         
         spawn("/srv/fhc");
         spawn("/srv/obio");
-        srv_start("/srv/cuda_adb");
         srv_start("/srv/i8042");
-        srv_start("/srv/adb_ms");
-        srv_start("/srv/char_ms");
+        srv_start("/srv/c_mouse");
 
         spawn("/srv/fb");
@@ -309 +298 @@
         getterm("term/vc5", "/app/bdsh");
         getterm("term/vc6", "/app/klog");
-
+        
         return 0;
 }