Changeset 61f28c4 in mainline

Timestamp:

2025-05-07T09:46:49Z (3 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

11cce63, 15162dd, 200b03c9, 3599384, 3f8e52a, 4708060d, 47a1232, 6808120d, 7bf4381, aca1777, c1b3d37, d7fe1f2, f50b07e, f62c901

Parents:

0cec807a

git-author:

Jiri Svoboda <jiri@…> (2025-05-06 17:46:39)

git-committer:

Jiri Svoboda <jiri@…> (2025-05-07 09:46:49)

Message:

Only eject installation CD after user confirms restart.

File:

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

uspace/app/sysinst/sysinst.c

@@ -158 +158 @@
 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 = {
@@ -272 +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;
@@ -897 +900 @@
         errno_t rc;
 
+        log_msg(LOG_DEFAULT, LVL_NOTE,
+            "sysinst_eject_phys_by_mp(%s)", path);
+
         rc = vol_create(&vol);
         if (rc != EOK) {
@@ -940 +946 @@
         shutdown_failed = false;
 
+        sysinst_action(sysinst, "Restarting the system.");
+
         rc = system_open(SYSTEM_DEFAULT, &sysinst_system_cb, NULL, &system);
         if (rc != EOK) {
@@ -1023 +1031 @@
         sysinst_action(sysinst, "Installing boot blocks.");
         rc = sysinst_copy_boot_blocks(sysinst, dev);
-        if (rc != EOK)
-                return rc;
-
-        sysinst_action(sysinst, "Ejecting installation media.");
-        rc = sysinst_eject_phys_by_mp(sysinst, CD_MOUNT_POINT);
         if (rc != EOK)
                 return rc;
@@ -1070 +1073 @@
 
         sysinst_progress_destroy(sysinst->progress);
+        sysinst->progress = NULL;
+
         rc = sysinst_restart_dlg_create(sysinst);
         if (rc != EOK)
@@ -1248 +1253 @@
 static void sysinst_action(sysinst_t *sysinst, const char *action)
 {
+        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);
+
         if (sysinst->progress == NULL)
                 return;
@@ -1253 +1260 @@
         ui_label_set_text(sysinst->progress->action, action);
         ui_label_paint(sysinst->progress->action);
-        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);
 }