Changeset 6d06bbc in mainline

Timestamp:

2026-04-08T18:33:34Z (3 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

5bc87028, 68f13bcc, df2f4d9

Parents:

9f9d9067

Message:

If performing OS upgrade, sysinst should say it's upgrading.

Location:

uspace/app/sysinst

Files:

• sysinst.c (modified) (3 diffs)
• sysinst.h (modified) (3 diffs)

uspace/app/sysinst/sysinst.c

@@ -629 +629 @@
                         goto error;
                 }
+
+                /* performing OS upgrade */
+                sysinst->oper = sio_upgrade;
+                if (sysinst->progress != NULL) {
+                        (void)ui_label_set_text(sysinst->progress->label,
+                            "Upgrading system. Please wait...");
+                        (void)ui_label_paint(sysinst->progress->label);
+                        (void)ui_window_set_caption(sysinst->bgwindow,
+                            "System Upgrade");
+                }
         } else {
                 /* Create installation partition. */
@@ -634 +644 @@
                 if (rc != EOK)
                         goto error;
+
+                /* performing initial OS installation */
+                sysinst->oper = sio_install;
         }
 
@@ -1458 +1471 @@
         ui_msg_dialog_params_init(&params);
         params.caption = "Restart System";
-        params.text = "Installation complete. Restart the system?";
+
+        if (sysinst->oper == sio_install)
+                params.text = "Installation complete. Restart the system?";
+        else
+                params.text = "Upgrade complete. Restart the system?";
+
         params.choice = umdc_ok_cancel;
         params.flags |= umdf_topmost | umdf_center;

uspace/app/sysinst/sysinst.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -54 +54 @@
 } sysinst_progress_t;
 
+/** Installer operation */
+typedef enum {
+        /** initial OS installation */
+        sio_install,
+        /** OS upgrade */
+        sio_upgrade
+} sysinst_oper_t;
+
 /** System installer. */
 typedef struct {
@@ -63 +71 @@
         /** Service ID of destination partition. */
         sysarg_t psvc_id;
+        /** operation being performed */
+        sysinst_oper_t oper;
         futil_t *futil;
         char errmsg[128];