Changeset 25444332 in mainline

Timestamp:

2026-04-06T14:26:00Z (22 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

4116579, 8bf4494

Parents:

4f16db1

Message:

Sysinst should be able to install to an existing MBR label.

Provided that the first partition slot is empty and the largest
free block is large enough.

Location:

uspace

Files:

• app/sysinst/sysinst.c (modified) (5 diffs)
• lib/fdisk/include/types/fdisk.h (modified) (3 diffs)
• lib/fdisk/src/fdisk.c (modified) (3 diffs)

uspace/app/sysinst/sysinst.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -75 +75 @@
 #define DEFAULT_DEV_2 "devices/\\hw\\sys\\00:01.0\\ide1\\c0d0"
 //#define DEFAULT_DEV "devices/\\hw\\pci0\\00:01.2\\uhci_rh\\usb01_a1\\mass-storage0\\l0"
+/** Index of partition which we must install to (hardwired in load.cfg) */
+#define INST_PART_IDX 1
 /** Volume label for the new file system */
 #define INST_VOL_LABEL "HelenOS"
@@ -442 +444 @@
         fdisk_t *fdisk = NULL;
         fdisk_dev_t *fdev = NULL;
+        fdisk_label_info_t linfo;
         fdisk_part_t *part;
         fdisk_part_spec_t pspec;
         fdisk_part_info_t pinfo;
+        bool create_label = false;
         bool dir_created = false;
         bool label_created = false;
@@ -483 +487 @@
         sysinst_debug(sysinst, "sysinst_label_dev(): create label");
 
-        rc = fdisk_label_create(fdev, lt_mbr);
-        if (rc != EOK) {
-                sysinst_error(sysinst, "Error creating label.");
-                goto error;
+        rc = fdisk_label_get_info(fdev, &linfo);
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error analyzing device.");
+                goto error;
+        }
+
+        switch (linfo.ltype) {
+        case lt_none:
+                /* need to create label */
+                create_label = true;
+                break;
+        case lt_mbr:
+                /* MBR label already present */
+                break;
+        default:
+                /* a different type of label already present */
+                sysinst_error(sysinst, "Disk contains unusable label.");
+                goto error;
+        }
+
+        /* Need to create label? */
+        if (create_label) {
+                rc = fdisk_label_create(fdev, lt_mbr);
+                if (rc != EOK) {
+                        sysinst_error(sysinst, "Error creating label.");
+                        goto error;
+                }
         }
 
@@ -505 +532 @@
         pspec.fstype = fs_ext4; /* Cannot be changed without modifying core.img */
         pspec.mountp = MOUNT_POINT;
+        pspec.index = INST_PART_IDX; /* Cannot be changed without modifying core.img */
         pspec.label = INST_VOL_LABEL;
 

uspace/lib/fdisk/include/types/fdisk.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -155 +155 @@
         /** File system type */
         vol_fstype_t fstype;
+        /** Partition index, default/0 = assign automatically */
+        int index;
         /** Volume label */
         const char *label;
@@ -171 +173 @@
         /** File system type */
         vol_fstype_t fstype;
+        /** Partition index */
+        int index;
         /** Volume label */
         char *label;

uspace/lib/fdisk/src/fdisk.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -673 +673 @@
         info->fstype = part->fstype;
         info->pkind = part->pkind;
+        info->index = part->index;
         info->label = part->label;
         info->svc_id = part->svc_id;
@@ -1031 +1032 @@
 
         if (pspec->pkind != lpk_logical) {
-                rc = fdisk_part_get_free_idx(dev, &index);
-                if (rc != EOK)
-                        return EIO;
+                if (pspec->index == 0) {
+                        /* allocate first free index */
+                        rc = fdisk_part_get_free_idx(dev, &index);
+                        if (rc != EOK)
+                                return EIO;
+                } else {
+                        /* user-specified index */
+                        index = pspec->index;
+                }
         } else {
                 index = 0;