Changeset 04e520e in mainline for uspace/app/sysinst/sysinst.c

Timestamp:

2024-07-24T10:33:58Z (6 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

3d2d455b, 53bff11, ddfe233

Parents:

145d4e2e

git-author:

Jiri Svoboda <jiri@…> (2024-07-23 17:33:46)

git-committer:

Jiri Svoboda <jiri@…> (2024-07-24 10:33:58)

Message:

Config file persistence

Copy /cfg to /w/cfg when installing and when starting live image
Move futil to separate library
Wait for /w to be mounted while booting from disk
Change taskbar and taskbar-cfg to work with /w/cfg/taskbar.sif

File:

• uspace/app/sysinst/sysinst.c (modified) (4 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,
@@ -226 +229 @@
         free(path);
         path = NULL;
+
+        /* Copy initial configuration files */
+        rc = futil_rcopy_contents(CFG_FILES_SRC, CFG_FILES_DEST);
+        if (rc != EOK)
+                return rc;
 
         return EOK;