Changes in uspace/app/sysinst/sysinst.c [9b95b964:ca127f37] in mainline

File:

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

uspace/app/sysinst/sysinst.c

@@ -41 +41 @@
 #include <errno.h>
 #include <fdisk.h>
+#include <futil.h>
 #include <loc.h>
 #include <stdio.h>
@@ -49 +50 @@
 #include <vol.h>
 
-#include "futil.h"
 #include "grub.h"
 #include "rdimg.h"
@@ -80 +80 @@
 #define BOOT_BLOCK_IDX 0 /* MBR */
 
+#define CFG_FILES_SRC "/cfg"
+#define CFG_FILES_DEST MOUNT_POINT "/cfg"
+
 static const char *default_devs[] = {
         DEFAULT_DEV_0,
@@ -227 +230 @@
         path = NULL;
 
+        /* Copy initial configuration files */
+        rc = futil_rcopy_contents(CFG_FILES_SRC, CFG_FILES_DEST);
+        if (rc != EOK)
+                return rc;
+
         return EOK;
 error:
@@ -271 +279 @@
         }
 
-        rv = asprintf(&path, "%s%s", rdpath, "/cfg/volsrv.sif");
+        rv = asprintf(&path, "%s%s", rdpath, "/cfg/initvol.sif");
         if (rv < 0) {
                 rc = ENOMEM;
@@ -298 +306 @@
                 printf("Error creating system partition configuration.\n");
                 rc = EIO;
+                goto error;
+        }
+
+        rc = vol_volumes_sync(volumes);
+        if (rc != EOK) {
+                printf("Error saving volume confiuration.\n");
                 goto error;
         }