Changeset 04e520e in mainline

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

3d2d455b, 53bff11, a11679cf, 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

Location:

uspace

Files:

• app/init/init.c (modified) (6 diffs)
• app/init/meson.build (modified) (1 diff)
• app/sysinst/meson.build (modified) (1 diff)
• app/sysinst/sysinst.c (modified) (4 diffs)
• app/taskbar-cfg/main.c (modified) (2 diffs)
• app/taskbar/taskbar.c (modified) (1 diff)
• lib/futil/doc/doxygroups.h (added)
• lib/futil/include/futil.h (moved) (moved from uspace/app/sysinst/futil.h ) (3 diffs)
• lib/futil/meson.build (added)
• lib/futil/src/futil.c (moved) (moved from uspace/app/sysinst/futil.c ) (2 diffs)
• lib/meson.build (modified) (1 diff)

uspace/app/init/init.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2005 Martin Decky
  * All rights reserved.
@@ -35 +36 @@
 
 #include <fibril.h>
+#include <futil.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -351 +353 @@
         vol_info_t vinfo;
         volume_id_t *volume_ids = NULL;
+        service_id_t *part_ids = NULL;
+        vol_part_info_t pinfo;
         size_t nvols;
+        size_t nparts;
+        bool sv_mounted;
         size_t i;
         errno_t rc;
@@ -385 +391 @@
         }
 
-        vol_destroy(vol);
         free(volume_ids);
+        volume_ids = NULL;
 
         if (!found_cfg) {
@@ -397 +403 @@
                                 printf("%s: Error creating directory '%s'.\n",
                                     NAME, *cp);
-                                return rc;
+                                goto error;
                         }
 
                         ++cp;
                 }
+
+                /* Copy initial configuration files */
+                rc = futil_rcopy_contents("/cfg", "/w/cfg");
+                if (rc != EOK)
+                        goto error;
         } else {
                 printf("%s: System volume is configured.\n", NAME);
-        }
-
+
+                /* Wait until system volume is mounted */
+                sv_mounted = false;
+
+                while (true) {
+                        rc = vol_get_parts(vol, &part_ids, &nparts);
+                        if (rc != EOK) {
+                                printf("Error getting list of volumes.\n");
+                                goto error;
+                        }
+
+                        for (i = 0; i < nparts; i++) {
+                                rc = vol_part_info(vol, part_ids[i], &pinfo);
+                                if (rc != EOK) {
+                                        printf("Error getting partition "
+                                            "information.\n");
+                                        rc = EIO;
+                                        goto error;
+                                }
+
+                                if (str_cmp(pinfo.cur_mp, "/w") == 0) {
+                                        sv_mounted = true;
+                                        break;
+                                }
+                        }
+
+                        if (sv_mounted)
+                                break;
+
+                        free(part_ids);
+                        part_ids = NULL;
+
+                        fibril_sleep(1);
+                        printf("Sleeping(1) for system volume.\n");
+                }
+        }
+
+        vol_destroy(vol);
         return EOK;
 error:
@@ -411 +458 @@
         if (volume_ids != NULL)
                 free(volume_ids);
+        if (part_ids != NULL)
+                free(part_ids);
 
         return rc;

uspace/app/init/meson.build

@@ -28 +28 @@
 #
 
-deps = [ 'untar', 'block' ]
+deps = [ 'block', 'futil', 'untar' ]
 link_args += '-static'
 src = files('init.c', 'untar.c')

uspace/app/sysinst/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'block', 'fdisk', 'sif' ]
+deps = [ 'block', 'fdisk', 'futil', 'sif' ]
 src = files(
-        'futil.c',
         'rdimg.c',
         'sysinst.c',

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;

uspace/app/taskbar-cfg/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -77 +77 @@
                 return 1;
 
-        rc = taskbar_cfg_open(tbcfg, "/cfg/taskbar.sif");
+        rc = taskbar_cfg_open(tbcfg, "/w/cfg/taskbar.sif");
         if (rc != EOK)
                 return 1;

uspace/app/taskbar/taskbar.c

@@ -48 +48 @@
 #include "wndlist.h"
 
-#define TASKBAR_CONFIG_FILE "/cfg/taskbar.sif"
+#define TASKBAR_CONFIG_FILE "/w/cfg/taskbar.sif"
 
 static void taskbar_wnd_close(ui_window_t *, void *);

uspace/lib/futil/include/futil.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2014 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup sysinst
+/** @addtogroup futil
  * @{
  */
@@ -38 +38 @@
 #define FUTIL_H
 
-#include <ipc/loc.h>
 #include <stddef.h>
 

uspace/lib/futil/src/futil.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2014 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup sysinst
+/** @addtogroup futil
  * @{
  */
-/** @file File manipulation utility functions for installer
+/** @file File manipulation utility functions
  */
 

uspace/lib/meson.build

@@ -74 +74 @@
         'fmtutil',
         'fs',
+        'futil',
         'gfx',
         'http',