Changes in uspace/app/init/init.c [75701004:a35b458] in mainline

File:

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

uspace/app/init/init.c

@@ -48 +48 @@
 #include <config.h>
 #include <io/logctl.h>
-#include "untar.h"
 #include "init.h"
 
@@ -84 +83 @@
         switch (rc) {
         case EOK:
-                if ((dev != NULL) && (str_cmp(dev, "") != 0))
+                if (dev != NULL)
                         printf("%s: %s mounted on %s (%s at %s)\n", NAME, desc, mntpt,
                             fstype, dev);
@@ -108 +107 @@
 }
 
-/** Mount root file system
- *
- * The operation blocks until the root file system
+/** Mount root filesystem
+ *
+ * The operation blocks until the root filesystem
  * server is ready for mounting.
  *
- * @param[in] fstype Root file system type.
+ * @param[in] fstype Root filesystem type.
  *
  * @return True on success.
@@ -121 +120 @@
 static bool mount_root(const char *fstype)
 {
-        const char *root_device = "";
-
-        if (str_cmp(fstype, "tmpfs") != 0)
-                root_device = ROOT_DEVICE;
-
-        errno_t rc = vfs_mount_path(ROOT_MOUNT_POINT, fstype, root_device, "",
+        const char *opts = "";
+
+        if (str_cmp(fstype, "tmpfs") == 0)
+                opts = "restore";
+
+        errno_t rc = vfs_mount_path(ROOT_MOUNT_POINT, fstype, ROOT_DEVICE, opts,
             IPC_FLAG_BLOCKING, 0);
         if (rc == EOK)
                 logctl_set_root();
-
-        bool ret = mount_report("Root file system", ROOT_MOUNT_POINT, fstype,
-            root_device, rc);
-
-        rc = vfs_cwd_set(ROOT_MOUNT_POINT);
-        if (rc != EOK) {
-                printf("%s: Unable to set current directory to %s (%s)\n",
-                    NAME, ROOT_MOUNT_POINT, str_error(ret));
-                return false;
-        }
-
-        if ((ret) && (str_cmp(fstype, "tmpfs") == 0)) {
-                printf("%s: Extracting root file system archive\n", NAME);
-                ret = bd_untar(ROOT_DEVICE);
-        }
-
-        return ret;
-}
-
-/** Mount locfs file system
- *
- * The operation blocks until the locfs file system
+        return mount_report("Root filesystem", ROOT_MOUNT_POINT, fstype,
+            ROOT_DEVICE, rc);
+}
+
+/** Mount locfs filesystem
+ *
+ * The operation blocks until the locfs filesystem
  * server is ready for mounting.
  *
@@ -162 +146 @@
         errno_t rc = vfs_mount_path(LOCFS_MOUNT_POINT, LOCFS_FS_TYPE, "", "",
             IPC_FLAG_BLOCKING, 0);
-        return mount_report("Location service file system", LOCFS_MOUNT_POINT,
+        return mount_report("Location service filesystem", LOCFS_MOUNT_POINT,
             LOCFS_FS_TYPE, NULL, rc);
 }
@@ -317 +301 @@
 {
         errno_t rc = vfs_mount_path(TMPFS_MOUNT_POINT, TMPFS_FS_TYPE, "", "", 0, 0);
-        return mount_report("Temporary file system", TMPFS_MOUNT_POINT,
+        return mount_report("Temporary filesystem", TMPFS_MOUNT_POINT,
             TMPFS_FS_TYPE, NULL, rc);
 }