Changeset ca127f37 in mainline

Timestamp:

2024-09-07T18:33:36Z (9 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

430442d, 47bfcfb, de4f165, e132103b

Parents:

e90019d

Message:

Persist volume configuration

Location:

uspace

Files:

• app/sysinst/sysinst.c (modified) (1 diff)
• srv/volsrv/part.c (modified) (2 diffs)
• srv/volsrv/volsrv.c (modified) (3 diffs)
• srv/volsrv/volsrv.h (added)
• srv/volsrv/volume.c (modified) (1 diff)
• srv/volsrv/volume.h (modified) (1 diff)

uspace/app/sysinst/sysinst.c

@@ -279 +279 @@
         }
 
-        rv = asprintf(&path, "%s%s", rdpath, "/cfg/volsrv.sif");
+        rv = asprintf(&path, "%s%s", rdpath, "/cfg/initvol.sif");
         if (rv < 0) {
                 rc = ENOMEM;

uspace/srv/volsrv/part.c

@@ -52 +52 @@
 #include "types/part.h"
 #include "volume.h"
+#include "volsrv.h"
 
 static errno_t vol_part_add_locked(vol_parts_t *, service_id_t);
@@ -403 +404 @@
         part->cur_mp_auto = mp_auto;
 
+        if (str_cmp(mp, "/w") == 0) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Mounted system volume - "
+                    "loading additional configuration.");
+                rc = vol_volumes_merge_to(part->parts->volumes,
+                    vol_cfg_file);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Error loading "
+                            "additional configuration.");
+                        return rc;
+                }
+        }
+
         return rc;
 }

uspace/srv/volsrv/volsrv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -53 +53 @@
 #define NAME  "volsrv"
 
-const char *vol_cfg_file = "/cfg/volsrv.sif";
+const char *vol_icfg_file = "/cfg/initvol.sif";
+const char *vol_cfg_file = "/w/cfg/volsrv.sif";
 
 static void vol_client_conn(ipc_call_t *, void *);
@@ -66 +67 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_init()");
 
-        rc = vol_volumes_create(vol_cfg_file, &volumes);
+        rc = vol_volumes_create(vol_icfg_file, &volumes);
         if (rc != EOK)
                 goto error;

uspace/srv/volsrv/volume.c

@@ -185 +185 @@
                 free(volumes);
 
+        return rc;
+}
+
+/** Merge list of volumes into new file.
+ *
+ * @param volumes List of volumes
+ * @param cfg_path Path to file containing configuration repository in SIF
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t vol_volumes_merge_to(vol_volumes_t *volumes, const char *cfg_path)
+{
+        sif_doc_t *doc = NULL;
+        sif_node_t *node;
+        const char *ntype;
+        char *dcfg_path;
+        errno_t rc;
+
+        dcfg_path = str_dup(cfg_path);
+        if (dcfg_path == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        free(volumes->cfg_path);
+        volumes->cfg_path = dcfg_path;
+
+        /* Try opening existing repository */
+        rc = sif_load(cfg_path, &doc);
+        if (rc != EOK) {
+                /* Failed to open existing, create new repository */
+                rc = vol_volumes_sync(volumes);
+                if (rc != EOK)
+                        goto error;
+        } else {
+                /*
+                 * Loaded existing configuration. Find 'volumes' node, should
+                 * be the first child of the root node.
+                 */
+                node = sif_node_first_child(sif_get_root(doc));
+
+                /* Verify it's the correct node type */
+                ntype = sif_node_get_type(node);
+                if (str_cmp(ntype, "volumes") != 0) {
+                        rc = EIO;
+                        goto error;
+                }
+
+                rc = vol_volumes_load(node, volumes);
+                if (rc != EOK)
+                        goto error;
+
+                sif_delete(doc);
+        }
+
+        return EOK;
+error:
+        if (doc != NULL)
+                (void) sif_delete(doc);
         return rc;
 }

uspace/srv/volsrv/volume.h

@@ -42 +42 @@
 
 extern errno_t vol_volumes_create(const char *, vol_volumes_t **);
+extern errno_t vol_volumes_merge_to(vol_volumes_t *, const char *);
 extern errno_t vol_volumes_sync(vol_volumes_t *);
 extern void vol_volumes_destroy(vol_volumes_t *);