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

Timestamp:

2018-10-09T08:40:53Z (6 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/init/init.c (modified) (4 diffs)

uspace/app/init/init.c

@@ -47 +47 @@
 #include <config.h>
 #include <io/logctl.h>
+#include <vol.h>
 #include "untar.h"
 #include "init.h"
@@ -70 +71 @@
 #define srv_start(path, ...) \
         srv_startl(path, path, ##__VA_ARGS__, NULL)
+
+static const char *sys_dirs[] = {
+        "/w/cfg",
+        "/w/data"
+};
 
 /** Print banner */
@@ -320 +326 @@
 }
 
+/** Init system volume.
+ *
+ * See if system volume is configured. If so, try to wait for it to become
+ * available. If not, create basic directories for live image omde.
+ */
+static errno_t init_sysvol(void)
+{
+        vol_t *vol = NULL;
+        vol_info_t vinfo;
+        volume_id_t *volume_ids = NULL;
+        size_t nvols;
+        size_t i;
+        errno_t rc;
+        bool found_cfg;
+        const char **cp;
+
+        rc = vol_create(&vol);
+        if (rc != EOK) {
+                printf("Error contacting volume service.\n");
+                goto error;
+        }
+
+        rc = vol_get_volumes(vol, &volume_ids, &nvols);
+        if (rc != EOK) {
+                printf("Error getting list of volumes.\n");
+                goto error;
+        }
+
+        /* XXX This could be handled more efficiently by volsrv itself */
+        found_cfg = false;
+        for (i = 0; i < nvols; i++) {
+                rc = vol_info(vol, volume_ids[i], &vinfo);
+                if (rc != EOK) {
+                        printf("Error getting volume information.\n");
+                        rc = EIO;
+                        goto error;
+                }
+
+                if (str_cmp(vinfo.path, "/w") == 0) {
+                        found_cfg = true;
+                        break;
+                }
+        }
+
+        vol_destroy(vol);
+        free(volume_ids);
+
+        if (!found_cfg) {
+                /* Prepare directory structure for live image mode */
+                printf("%s: Creating live image directory structure.\n", NAME);
+                cp = sys_dirs;
+                while (*cp != NULL) {
+                        rc = vfs_link_path(*cp, KIND_DIRECTORY, NULL);
+                        if (rc != EOK) {
+                                printf("%s: Error creating directory '%s'.\n",
+                                    NAME, *cp);
+                                return rc;
+                        }
+
+                        ++cp;
+                }
+        } else {
+                printf("%s: System volume is configured.\n", NAME);
+        }
+
+        return EOK;
+error:
+        vol_destroy(vol);
+        if (volume_ids != NULL)
+                free(volume_ids);
+
+        return rc;
+}
+
 int main(int argc, char *argv[])
 {
@@ -375 +455 @@
         srv_start("/srv/hound");
 
+        init_sysvol();
+
         if (!config_key_exists("console")) {
                 rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);