Changeset 63c1dd5 in mainline for uspace/app/sysinst/sysinst.c

Timestamp:

2018-10-09T08:40:53Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

63a045c

Parents:

ee9c703

git-author:

Jiri Svoboda <jiri@…> (2018-10-08 18:38:16)

git-committer:

Jiri Svoboda <jiri@…> (2018-10-09 08:40:53)

Message:

Persistence of Tetris highscore table. Detect live mode and create directory structure in init task. Reading volume configuration, vol -c.

File:

• uspace/app/sysinst/sysinst.c (modified) (3 diffs)

uspace/app/sysinst/sysinst.c

@@ -79 +79 @@
 #define BOOT_BLOCK_IDX 0 /* MBR */
 
+static const char *sys_dirs[] = {
+        "/cfg",
+        "/data"
+};
+
 /** Label the destination device.
  *
@@ -160 +165 @@
         *psvc_id = pinfo.svc_id;
         return EOK;
+}
+
+/** Set up system volume structure.
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_setup_sysvol(void)
+{
+        errno_t rc;
+        char *path = NULL;
+        const char **cp;
+        int rv;
+
+        cp = sys_dirs;
+        while (*cp != NULL) {
+                rv = asprintf(&path, "%s%s", MOUNT_POINT, *cp);
+                if (rv < 0) {
+                        rc = ENOMEM;
+                        goto error;
+                }
+
+                rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
+                if (rc != EOK) {
+                        printf("Error creating directory '%s'.\n", path);
+                        goto error;
+                }
+
+                free(path);
+                path = NULL;
+                ++cp;
+        }
+
+        free(path);
+        path = NULL;
+
+        return EOK;
+error:
+        if (path != NULL)
+                free(path);
+        return rc;
 }
 
@@ -415 +460 @@
                 return rc;
 
-        printf("FS created and mounted. Copying boot files.\n");
+        printf("FS created and mounted. Creating system directory structure.\n");
+        rc = sysinst_setup_sysvol();
+        if (rc != EOK)
+                return rc;
+
+        printf("Directories created. Copying boot files.\n");
         rc = sysinst_copy_boot_files();
         if (rc != EOK)