Changeset f49cf64 in mainline

Timestamp:

2009-06-29T16:03:18Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

057760d3

Parents:

7fcb74c

Message:

simplify init, create /dev/null0 on demand

File:

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

uspace/app/init/init.c

@@ -56 +56 @@
 static bool mount_root(const char *fstype)
 {
-        int rc = -1;
         char *opts = "";
         const char *root_dev = "initrd";
@@ -62 +61 @@
         if (str_cmp(fstype, "tmpfs") == 0)
                 opts = "restore";
-
-        while (rc < 0) {
-                rc = mount(fstype, "/", root_dev, opts, IPC_FLAG_BLOCKING);
-                
-                switch (rc) {
-                case EOK:
-                        printf(NAME ": Root filesystem mounted, %s at %s\n",
-                            fstype, root_dev);
-                        break;
-                case EBUSY:
-                        printf(NAME ": Root filesystem already mounted\n");
-                        break;
-                case ELIMIT:
-                        printf(NAME ": Unable to mount root filesystem\n");
-                        return false;
-                case ENOENT:
-                        printf(NAME ": Unknown filesystem type (%s)\n", fstype);
-                        return false;
-                }
+        
+        int rc = mount(fstype, "/", root_dev, opts, IPC_FLAG_BLOCKING);
+        
+        switch (rc) {
+        case EOK:
+                printf(NAME ": Root filesystem mounted, %s at %s\n",
+                    fstype, root_dev);
+                break;
+        case EBUSY:
+                printf(NAME ": Root filesystem already mounted\n");
+                return false;
+        case ELIMIT:
+                printf(NAME ": Unable to mount root filesystem\n");
+                return false;
+        case ENOENT:
+                printf(NAME ": Unknown filesystem type (%s)\n", fstype);
+                return false;
+        default:
+                printf(NAME ": Error mounting root filesystem (%d)\n", rc);
+                return false;
         }
         
@@ -88 +88 @@
 static bool mount_devfs(void)
 {
-        int rc = -1;
-        
-        while (rc < 0) {
-                rc = mount("devfs", "/dev", "null", "", IPC_FLAG_BLOCKING);
-                
-                switch (rc) {
-                case EOK:
-                        printf(NAME ": Device filesystem mounted\n");
-                        break;
-                case EBUSY:
-                        printf(NAME ": Device filesystem already mounted\n");
-                        break;
-                case ELIMIT:
-                        printf(NAME ": Unable to mount device filesystem\n");
-                        return false;
-                case ENOENT:
-                        printf(NAME ": Unknown filesystem type (devfs)\n");
-                        return false;
-                }
+        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", "/dev", null, "", IPC_FLAG_BLOCKING);
+        
+        switch (rc) {
+        case EOK:
+                printf(NAME ": Device filesystem mounted\n");
+                break;
+        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;
         }
         
@@ -188 +200 @@
         spawn("/srv/ata_bd");
         spawn("/srv/gxe_bd");
-
-        usleep(250000);
-        mount_data();   
-
+        
+        usleep(250000); // FIXME
+        mount_data();
+        
         getvc("vc0", "/app/bdsh");
         getvc("vc1", "/app/bdsh");