Changeset aca1777 in mainline for uspace/app/sysinst/sysinst.c

Timestamp:

2025-05-08T17:12:05Z (2 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

2f21cd4

Parents:

1cfce3f (diff), 61f28c4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge upstream into helenraid

File:

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

uspace/app/sysinst/sysinst.c

@@ -73 +73 @@
 #define DEFAULT_DEV_0 "devices/\\hw\\sys\\00:01.1\\c0d0"
 #define DEFAULT_DEV_1 "devices/\\hw\\sys\\ide1\\c0d0"
+#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"
 /** Volume label for the new file system */
@@ -95 +96 @@
         DEFAULT_DEV_0,
         DEFAULT_DEV_1,
+        DEFAULT_DEV_2,
         NULL
 };
@@ -155 +157 @@
 static void sysinst_futil_copy_file(void *, const char *, const char *);
 static void sysinst_futil_create_dir(void *, const char *);
+static errno_t sysinst_eject_dev(sysinst_t *, service_id_t);
+static errno_t sysinst_eject_phys_by_mp(sysinst_t *, const char *);
 
 static futil_cb_t sysinst_futil_cb = {
@@ -269 +273 @@
         case 0:
                 /* OK */
+                sysinst_action(sysinst, "Ejecting installation media.");
+                (void)sysinst_eject_phys_by_mp(sysinst, CD_MOUNT_POINT);
                 (void)sysinst_restart(sysinst);
                 break;
@@ -424 +430 @@
 }
 
-/** Label the destination device.
+/** Label and mount the destination device.
  *
  * @param sysinst System installer
@@ -432 +438 @@
  * @return EOK on success or an error code
  */
-static errno_t sysinst_label_dev(sysinst_t *sysinst, const char *dev,
-    service_id_t *psvc_id)
-{
-        fdisk_t *fdisk;
-        fdisk_dev_t *fdev;
+static errno_t sysinst_label_dev(sysinst_t *sysinst, const char *dev)
+{
+        fdisk_t *fdisk = NULL;
+        fdisk_dev_t *fdev = NULL;
         fdisk_part_t *part;
         fdisk_part_spec_t pspec;
         fdisk_part_info_t pinfo;
+        bool dir_created = false;
+        bool label_created = false;
         capa_spec_t capa;
         service_id_t sid;
@@ -448 +455 @@
         rc = loc_service_get_id(dev, &sid, 0);
         if (rc != EOK)
-                return rc;
+                goto error;
 
         sysinst_debug(sysinst, "sysinst_label_dev(): open device");
@@ -455 +462 @@
         if (rc != EOK) {
                 sysinst_error(sysinst, "Error initializing fdisk.");
-                return rc;
+                goto error;
         }
 
@@ -461 +468 @@
         if (rc != EOK) {
                 sysinst_error(sysinst, "Error opening device.");
-                return rc;
+                goto error;
         }
 
@@ -469 +476 @@
         if (rc != EOK) {
                 sysinst_error(sysinst, "Error creating mount directory.");
-                return rc;
-        }
+                goto error;
+        }
+
+        dir_created = true;
 
         sysinst_debug(sysinst, "sysinst_label_dev(): create label");
@@ -477 +486 @@
         if (rc != EOK) {
                 sysinst_error(sysinst, "Error creating label.");
-                return rc;
-        }
+                goto error;
+        }
+
+        label_created = true;
 
         sysinst_debug(sysinst, "sysinst_label_dev(): create partition");
@@ -486 +497 @@
                 sysinst_error(sysinst,
                     "Error getting available capacity.");
-                return rc;
+                goto error;
         }
 
@@ -499 +510 @@
         if (rc != EOK) {
                 sysinst_error(sysinst, "Error creating partition.");
-                return rc;
+                goto error;
         }
 
@@ -505 +516 @@
         if (rc != EOK) {
                 sysinst_error(sysinst, "Error getting partition information.");
-                return rc;
+                goto error;
         }
 
         sysinst_debug(sysinst, "sysinst_label_dev(): OK");
-        *psvc_id = pinfo.svc_id;
+        fdisk_dev_close(fdev);
+        fdisk_destroy(fdisk);
+        sysinst->psvc_id = pinfo.svc_id;
+        return EOK;
+error:
+        if (label_created)
+                fdisk_label_destroy(fdev);
+        if (dir_created)
+                (void)vfs_unlink_path(MOUNT_POINT);
+        if (fdev != NULL)
+                fdisk_dev_close(fdev);
+        if (fdisk != NULL)
+                fdisk_destroy(fdisk);
+        return rc;
+}
+
+/** Finish/unmount destination device.
+ *
+ * @param sysinst System installer
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_finish_dev(sysinst_t *sysinst)
+{
+        errno_t rc;
+
+        sysinst_debug(sysinst, "sysinst_finish_dev(): eject target volume");
+        rc = sysinst_eject_dev(sysinst, sysinst->psvc_id);
+        if (rc != EOK)
+                return rc;
+
+        sysinst_debug(sysinst, "sysinst_finish_dev(): "
+            "deleting mount directory");
+        (void)vfs_unlink_path(MOUNT_POINT);
+
         return EOK;
 }
@@ -550 +595 @@
         rc = futil_rcopy_contents(sysinst->futil, CFG_FILES_SRC,
             CFG_FILES_DEST);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error copying initial configuration "
+                    "files.");
+                return rc;
+        }
 
         return EOK;
@@ -571 +619 @@
             "sysinst_copy_boot_files(): copy bootloader files");
         rc = futil_rcopy_contents(sysinst->futil, BOOT_FILES_SRC, MOUNT_POINT);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error copying bootloader "
+                    "files.");
+                return rc;
+        }
 
         sysinst_debug(sysinst, "sysinst_copy_boot_files(): OK");
@@ -811 +862 @@
  *
  * @param sysinst System installer
- * @param psvc_id Partition service ID
+ * @param part_id Partition service ID
  * @return EOK on success or an error code
  */
@@ -825 +876 @@
         }
 
-        rc = vol_part_eject(vol, part_id, vef_physical);
+        rc = vol_part_eject(vol, part_id, vef_none);
         if (rc != EOK) {
                 sysinst_error(sysinst, "Error ejecting volume.");
@@ -837 +888 @@
 }
 
+/** Physically eject volume by mount point.
+ *
+ * @param sysinst System installer
+ * @param path Mount point
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_eject_phys_by_mp(sysinst_t *sysinst, const char *path)
+{
+        vol_t *vol = NULL;
+        sysarg_t part_id;
+        errno_t rc;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE,
+            "sysinst_eject_phys_by_mp(%s)", path);
+
+        rc = vol_create(&vol);
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error contacting volume service.");
+                goto out;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_part_by_mp: mp='%s'\n",
+            path);
+        rc = vol_part_by_mp(vol, path, &part_id);
+        if (rc != EOK) {
+                sysinst_error(sysinst,
+                    "Error finding installation media mount point.");
+                goto out;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "eject svc_id %lu", (unsigned long)part_id);
+        rc = vol_part_eject(vol, part_id, vef_physical);
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error ejecting volume.");
+                goto out;
+        }
+
+        rc = EOK;
+out:
+        vol_destroy(vol);
+        return rc;
+}
+
 /** Restart the system.
  *
@@ -852 +946 @@
         shutdown_failed = false;
 
+        sysinst_action(sysinst, "Restarting the system.");
+
         rc = system_open(SYSTEM_DEFAULT, &sysinst_system_cb, NULL, &system);
         if (rc != EOK) {
@@ -901 +997 @@
 {
         errno_t rc;
-        service_id_t psvc_id;
+        bool clean_dev = false;
 
         sysinst_action(sysinst, "Creating device label and file system.");
 
-        rc = sysinst_label_dev(sysinst, dev, &psvc_id);
-        if (rc != EOK)
-                return rc;
+        rc = sysinst_label_dev(sysinst, dev);
+        if (rc != EOK)
+                goto error;
+
+        clean_dev = true;
 
         sysinst_action(sysinst, "Creating system directory structure.");
         rc = sysinst_setup_sysvol(sysinst);
         if (rc != EOK)
-                return rc;
+                goto error;
 
         sysinst_action(sysinst, "Copying boot files.");
         rc = sysinst_copy_boot_files(sysinst);
         if (rc != EOK)
-                return rc;
+                goto error;
 
         sysinst_action(sysinst, "Configuring the system.");
         rc = sysinst_customize_initrd(sysinst);
         if (rc != EOK)
-                return rc;
+                goto error;
+
+        sysinst_action(sysinst, "Finishing system volume.");
+        rc = sysinst_finish_dev(sysinst);
+        if (rc != EOK)
+                goto error;
+
+        clean_dev = false;
 
         sysinst_action(sysinst, "Installing boot blocks.");
@@ -929 +1034 @@
                 return rc;
 
-        sysinst_action(sysinst, "Ejecting device.");
-        rc = sysinst_eject_dev(sysinst, psvc_id);
-        if (rc != EOK)
-                return rc;
-
-        return EOK;
+        return EOK;
+error:
+        if (clean_dev)
+                (void)sysinst_finish_dev(sysinst);
+        return rc;
 }
 
@@ -969 +1073 @@
 
         sysinst_progress_destroy(sysinst->progress);
+        sysinst->progress = NULL;
+
         rc = sysinst_restart_dlg_create(sysinst);
         if (rc != EOK)
@@ -1147 +1253 @@
 static void sysinst_action(sysinst_t *sysinst, const char *action)
 {
+        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);
+
         if (sysinst->progress == NULL)
                 return;
@@ -1152 +1260 @@
         ui_label_set_text(sysinst->progress->action, action);
         ui_label_paint(sysinst->progress->action);
-        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);
 }