Changeset 1313ee9 in mainline for uspace/app/init/init.c

Timestamp:

2009-12-13T15:17:08Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

963dd91

Parents:

fc6dd18

Message:

introduce device namespaces

• add support for explicit open in libfs (needed by devfs, but also possibly for other filesystems which need to track some stateful information)
• extend libfs to be more generic, make proper adjustments to libc, tmpfs and fat
• various updates to make use of the device namespaces
• code cleanup

File:

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

uspace/app/init/init.c

@@ -58 +58 @@
 {
         char *opts = "";
-        const char *root_dev = "initrd";
+        const char *root_dev = "bd/initrd";
         
         if (str_cmp(fstype, "tmpfs") == 0)
@@ -97 +97 @@
         }
         
-        snprintf(null, MAX_DEVICE_NAME, "null%d", null_id);
+        snprintf(null, MAX_DEVICE_NAME, "null/%d", null_id);
         int rc = mount("devfs", "/dev", null, "", IPC_FLAG_BLOCKING);
         
@@ -170 +170 @@
         }
 
-        if (texit != TASK_EXIT_NORMAL || retval != 0) {
+        if ((texit != TASK_EXIT_NORMAL) || (retval != 0)) {
                 printf(NAME ": Server %s failed to start (returned %d)\n",
                         fname, retval);
@@ -206 +206 @@
         int rc;
 
-        printf("Trying to mount disk0 on /data... ");
+        printf("Trying to mount bd/disk0 on /data... ");
         fflush(stdout);
 
-        rc = mount("fat", "/data", "disk0", "wtcache", 0);
+        rc = mount("fat", "/data", "bd/disk0", "wtcache", 0);
         if (rc == EOK)
                 printf("OK\n");
@@ -256 +256 @@
 #endif
 
-        getvc("vc0", "/app/bdsh");
-        getvc("vc1", "/app/bdsh");
-        getvc("vc2", "/app/bdsh");
-        getvc("vc3", "/app/bdsh");
-        getvc("vc4", "/app/bdsh");
-        getvc("vc5", "/app/bdsh");
-        getvc("vc6", "/app/klog");
+        getvc("term/vc0", "/app/bdsh");
+        getvc("term/vc1", "/app/bdsh");
+        getvc("term/vc2", "/app/bdsh");
+        getvc("term/vc3", "/app/bdsh");
+        getvc("term/vc4", "/app/bdsh");
+        getvc("term/vc5", "/app/bdsh");
+        getvc("term/vc6", "/app/klog");
         
         return 0;