Changeset 29e7cc7 in mainline for uspace/srv/system/system.c

Timestamp:

2025-04-18T15:14:10Z (3 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e77c3ed

Parents:

800d188 (diff), 25fdb2d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'upstream/master' into helenraid

File:

• uspace/srv/system/system.c (modified) (3 diffs)

uspace/srv/system/system.c

@@ -328 +328 @@
         size_t nparts;
         bool sv_mounted;
+        futil_t *futil = NULL;
         size_t i;
         errno_t rc;
@@ -380 +381 @@
 
                 /* Copy initial configuration files */
-                rc = futil_rcopy_contents("/cfg", "/w/cfg");
+                rc = futil_create(NULL, NULL, &futil);
                 if (rc != EOK)
                         goto error;
+
+                rc = futil_rcopy_contents(futil, "/cfg", "/w/cfg");
+                if (rc != EOK)
+                        goto error;
+
+                futil_destroy(futil);
+                futil = NULL;
         } else {
                 printf("%s: System volume is configured.\n", NAME);
@@ -429 +437 @@
         if (part_ids != NULL)
                 free(part_ids);
+        if (futil != NULL)
+                futil_destroy(futil);
 
         return rc;