Changeset 9f9d9067 in mainline

Timestamp:

2026-04-08T11:23:57Z (4 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

6d06bbc

Parents:

8bf4494

git-author:

Jiri Svoboda <jiri@…> (2026-04-08 18:23:43)

git-committer:

Jiri Svoboda <jiri@…> (2026-04-08 11:23:57)

Message:

Allow sysinst to upgrade an existing installation (WIP).

Location:

uspace

Files:

• app/sysinst/sysinst.c (modified) (6 diffs)
• lib/futil/src/futil.c (modified) (2 diffs)

uspace/app/sysinst/sysinst.c

@@ -77 +77 @@
 /** Index of partition which we must install to (hardwired in load.cfg) */
 #define INST_PART_IDX 1
+/* File system type cannot be changed without modifying core.img */
+#define INST_FSTYPE fs_ext4
 /** Volume label for the new file system */
 #define INST_VOL_LABEL "HelenOS"
@@ -432 +434 @@
 }
 
+/** Find existing OS partition.
+ *
+ * @param sysinst System installer
+ * @param fdev Destination device
+ * @param rpart Place to store pointer to partition
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_existing_os_part_find(sysinst_t *sysinst,
+    fdisk_dev_t *fdev, fdisk_part_t **rpart)
+{
+        fdisk_part_t *part;
+        fdisk_part_info_t pinfo;
+        errno_t rc;
+
+        sysinst_debug(sysinst, "sysinst_existing_os_part_find(): walk partitions");
+
+        part = fdisk_part_first(fdev);
+        while (part != NULL) {
+                rc = fdisk_part_get_info(part, &pinfo);
+                if (rc != EOK) {
+                        sysinst_error(sysinst,
+                            "Error getting partition information.");
+                        goto error;
+                }
+
+                if (pinfo.index == INST_PART_IDX && pinfo.pkind == lpk_primary)
+                        break;
+
+                part = fdisk_part_next(part);
+        }
+
+        /* Partition with index INST_PART_IDX not found? */
+        if (part == NULL)
+                return ENOENT;
+
+        /* Correct file system type? */
+        if (pinfo.fstype != INST_FSTYPE) {
+                /* Not a usable existing partition. */
+                return ENOENT;
+        }
+
+        sysinst_debug(sysinst, "sysinst_existing_os_part_find(): OK");
+        sysinst->psvc_id = pinfo.svc_id;
+        *rpart = part;
+        return EOK;
+error:
+        return rc;
+}
+
 /** Create installation partition.
  *
@@ -459 +511 @@
         pspec.capacity = capa;
         pspec.pkind = lpk_primary;
-        pspec.fstype = fs_ext4; /* Cannot be changed without modifying core.img */
+        pspec.fstype = INST_FSTYPE; /* Cannot be changed without modifying core.img */
         pspec.mountp = MOUNT_POINT;
         pspec.index = INST_PART_IDX; /* Cannot be changed without modifying core.img */
@@ -494 +546 @@
         fdisk_t *fdisk = NULL;
         fdisk_dev_t *fdev = NULL;
+        fdisk_part_t *part;
         fdisk_label_info_t linfo;
         bool create_label = false;
@@ -566 +619 @@
         sysinst_debug(sysinst, "sysinst_label_dev(): create partition");
 
-        /* Create installation partition. */
-        rc = sysinst_inst_part_create(sysinst, fdev);
-        if (rc != EOK)
-                goto error;
+        /* Existing OS partition? */
+        rc = sysinst_existing_os_part_find(sysinst, fdev, &part);
+        if (rc == EOK) {
+                /* Set mount point for installation partition. */
+                rc = fdisk_part_set_mountp(part, MOUNT_POINT);
+                if (rc != EOK) {
+                        sysinst_error(sysinst, "Cannot mount installation "
+                            "partition.");
+                        goto error;
+                }
+        } else {
+                /* Create installation partition. */
+                rc = sysinst_inst_part_create(sysinst, fdev);
+                if (rc != EOK)
+                        goto error;
+        }
 
         return EOK;
@@ -627 +692 @@
 
                 rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
-                if (rc != EOK) {
+                if (rc != EOK && rc != EEXIST) {
                         sysinst_error(sysinst, "Error creating directory.");
                         goto error;

uspace/lib/futil/src/futil.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -179 +179 @@
                                 futil->cb->create_dir(futil->cb_arg, destp);
                         rc = vfs_link_path(destp, KIND_DIRECTORY, NULL);
-                        if (rc != EOK)
+                        if (rc != EOK && rc != EEXIST)
                                 goto error;
                         rc = futil_rcopy_contents(futil, srcp, destp);