Changes in uspace/app/sysinst/sysinst.c [629b480:2c21595] in mainline

File:

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

uspace/app/sysinst/sysinst.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <errno.h>
 #include <fdisk.h>
-#include <futil.h>
+#include <fmgt.h>
 #include <gfx/render.h>
 #include <io/log.h>
@@ -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
+/* 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"
@@ -87 +91 @@
 #define CD_MOUNT_POINT "/vol/" CD_VOL_LABEL
 
-#define BOOT_FILES_SRC CD_MOUNT_POINT
+#define BOOT_FILES_SRC CD_MOUNT_POINT "/boot"
 #define BOOT_BLOCK_IDX 0 /* MBR */
 
 #define CFG_FILES_SRC "/cfg"
-#define CFG_FILES_DEST MOUNT_POINT "/cfg"
+#define CFG_FILES_DEST MOUNT_POINT
 
 static const char *default_devs[] = {
@@ -139 +143 @@
 };
 
+static void sysinst_upgrade_confirm_button(ui_msg_dialog_t *, void *, unsigned);
+static void sysinst_upgrade_confirm_close(ui_msg_dialog_t *, void *);
+
+static ui_msg_dialog_cb_t sysinst_upgrade_confirm_cb = {
+        .button = sysinst_upgrade_confirm_button,
+        .close = sysinst_upgrade_confirm_close
+};
+
 static errno_t sysinst_restart_dlg_create(sysinst_t *);
 static void sysinst_restart_dlg_button(ui_msg_dialog_t *, void *, unsigned);
@@ -151 +163 @@
 static errno_t sysinst_restart(sysinst_t *);
 static void sysinst_progress_destroy(sysinst_progress_t *);
+static void sysinst_progress(sysinst_t *, const char *);
 static void sysinst_action(sysinst_t *, const char *);
 static void sysinst_error(sysinst_t *, const char *);
 static void sysinst_debug(sysinst_t *, const char *);
 
-static void sysinst_futil_copy_file(void *, const char *, const char *);
-static void sysinst_futil_create_dir(void *, const char *);
+static fmgt_exists_action_t sysinst_fmgt_exists_query(void *, fmgt_exists_t *);
+static void sysinst_fmgt_action(void *, fmgt_action_t, const char *,
+    const char *);
+static void sysinst_fmgt_progress(void *, fmgt_progress_t *);
 static errno_t sysinst_eject_dev(sysinst_t *, service_id_t);
-
-static futil_cb_t sysinst_futil_cb = {
-        .copy_file = sysinst_futil_copy_file,
-        .create_dir = sysinst_futil_create_dir
+static errno_t sysinst_eject_phys_by_mp(sysinst_t *, const char *);
+static errno_t sysinst_upgrade_confirm_create(sysinst_t *);
+
+static fmgt_cb_t sysinst_fmgt_cb = {
+        .exists_query = sysinst_fmgt_exists_query,
+        .action = sysinst_fmgt_action,
+        .progress = sysinst_fmgt_progress
 };
 
@@ -253 +271 @@
 }
 
-/** Restart system dialog OK button press.
+/** Upgrade confirm dialog OK button press.
  *
  * @param dialog Message dialog
@@ -260 +278 @@
  * @param earg Entry argument
  */
-static void sysinst_restart_dlg_button(ui_msg_dialog_t *dialog, void *arg,
+static void sysinst_upgrade_confirm_button(ui_msg_dialog_t *dialog, void *arg,
     unsigned btn)
 {
@@ -266 +284 @@
 
         ui_msg_dialog_destroy(dialog);
-
-        (void)sysinst;
 
         switch (btn) {
         case 0:
                 /* OK */
+                fibril_mutex_lock(&sysinst->responded_lock);
+                sysinst->responded = true;
+                sysinst->quit = false;
+                fibril_mutex_unlock(&sysinst->responded_lock);
+                fibril_condvar_signal(&sysinst->responded_cv);
+                break;
+        default:
+                /* Cancel */
+                fibril_mutex_lock(&sysinst->responded_lock);
+                sysinst->responded = true;
+                sysinst->quit = true;
+                fibril_mutex_unlock(&sysinst->responded_lock);
+                fibril_condvar_signal(&sysinst->responded_cv);
+                break;
+        }
+}
+
+/** Upgrade confirm dialog close request.
+ *
+ * @param dialog Message dialog
+ * @param arg Argument (sysinst_t *)
+ */
+static void sysinst_upgrade_confirm_close(ui_msg_dialog_t *dialog, void *arg)
+{
+        sysinst_t *sysinst = (sysinst_t *) arg;
+
+        ui_msg_dialog_destroy(dialog);
+        ui_quit(sysinst->ui);
+}
+
+/** Restart system dialog OK button press.
+ *
+ * @param dialog Message dialog
+ * @param arg Argument (sysinst_t *)
+ * @param btn Button number
+ * @param earg Entry argument
+ */
+static void sysinst_restart_dlg_button(ui_msg_dialog_t *dialog, void *arg,
+    unsigned btn)
+{
+        sysinst_t *sysinst = (sysinst_t *) arg;
+
+        ui_msg_dialog_destroy(dialog);
+
+        (void)sysinst;
+
+        switch (btn) {
+        case 0:
+                /* OK */
+                sysinst_action(sysinst, "Ejecting installation media.");
+                (void)sysinst_eject_phys_by_mp(sysinst, CD_MOUNT_POINT);
                 (void)sysinst_restart(sysinst);
                 break;
@@ -347 +414 @@
 }
 
-/** Called when futil is starting to copy a file.
+/** Called when fmgt hits an existing file while copying.
+ *
+ * @param arg Argument (sysinst_t *)
+ * @param exists Information about existing file
+ * @return Existing file recovery action
+ */
+fmgt_exists_action_t sysinst_fmgt_exists_query(void *arg, fmgt_exists_t *exists)
+{
+        sysinst_t *sysinst = (sysinst_t *)arg;
+
+        (void)sysinst;
+        (void)exists->fname;
+
+        sysinst_action(sysinst, exists->fname);
+
+        /*
+         * Before starting fmgt operation, the caller would specify
+         * whether to overwrite existing files.
+         */
+        if (sysinst->overwrite)
+                return fmgt_exr_overwrite;
+        else
+                return fmgt_exr_skip;
+}
+
+/** Called when fmgt is starting to perform action on a file.
+ *
+ * @param arg Argument (sysinst_t *)
+ * @param action Action being performed
+ * @param src Source or only path
+ * @param dest Destination path or @c NULL
+ */
+static void sysinst_fmgt_action(void *arg, fmgt_action_t action,
+    const char *src, const char *dest)
+{
+        sysinst_t *sysinst = (sysinst_t *)arg;
+        char buf[128];
+
+        (void)src;
+
+        switch (action) {
+        case fmgt_ac_create:
+                snprintf(buf, sizeof(buf), "Creating %s.", src);
+                sysinst_action(sysinst, buf);
+                break;
+        case fmgt_ac_copy:
+                snprintf(buf, sizeof(buf), "Copying %s.", dest);
+                sysinst_action(sysinst, buf);
+                break;
+        default:
+                break;
+        }
+}
+
+/** Called by fmgt to update on progress.
  *
  * @param arg Argument (sysinst_t *)
@@ -353 +474 @@
  * @param dest Destination path
  */
-static void sysinst_futil_copy_file(void *arg, const char *src,
-    const char *dest)
+static void sysinst_fmgt_progress(void *arg, fmgt_progress_t *progress)
 {
         sysinst_t *sysinst = (sysinst_t *)arg;
         char buf[128];
 
-        (void)src;
-        snprintf(buf, sizeof(buf), "Copying %s.", dest);
-        sysinst_action(sysinst, buf);
-}
-
-/** Called when futil is about to create a directory.
- *
- * @param arg Argument (sysinst_t *)
- * @param dest Destination path
- */
-static void sysinst_futil_create_dir(void *arg, const char *dest)
-{
-        sysinst_t *sysinst = (sysinst_t *)arg;
-        char buf[128];
-
-        snprintf(buf, sizeof(buf), "Creating %s.", dest);
-        sysinst_action(sysinst, buf);
+        snprintf(buf, sizeof(buf), "Copied %s files, %s; "
+            "current file: %s done.", progress->total_procf,
+            progress->total_procb, progress->curf_percent);
+        sysinst_progress(sysinst, buf);
 }
 
@@ -427 +534 @@
 }
 
+/** 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.
+ *
+ * @param sysinst System installer
+ * @param fdev Destination device
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_inst_part_create(sysinst_t *sysinst, fdisk_dev_t *fdev)
+{
+        fdisk_part_t *part;
+        fdisk_part_spec_t pspec;
+        fdisk_part_info_t pinfo;
+        capa_spec_t capa;
+        errno_t rc;
+
+        sysinst_debug(sysinst, "sysinst_inst_part_create(): get maximum available block");
+
+        rc = fdisk_part_get_max_avail(fdev, spc_pri, &capa);
+        if (rc != EOK) {
+                sysinst_error(sysinst,
+                    "Error getting available capacity.");
+                goto error;
+        }
+
+        fdisk_pspec_init(&pspec);
+        pspec.capacity = capa;
+        pspec.pkind = lpk_primary;
+        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 */
+        pspec.label = INST_VOL_LABEL;
+
+        rc = fdisk_part_create(fdev, &pspec, &part);
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error creating partition.");
+                goto error;
+        }
+
+        rc = fdisk_part_get_info(part, &pinfo);
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error getting partition information.");
+                goto error;
+        }
+
+        sysinst_debug(sysinst, "sysinst_inst_part_create(): OK");
+        sysinst->psvc_id = pinfo.svc_id;
+        return EOK;
+error:
+        return rc;
+}
+
 /** Label and mount the destination device.
  *
  * @param sysinst System installer
  * @param dev Disk device to label
- * @param psvc_id Place to store service ID of the created partition
  *
  * @return EOK on success or an error code
@@ -440 +647 @@
         fdisk_dev_t *fdev = NULL;
         fdisk_part_t *part;
-        fdisk_part_spec_t pspec;
-        fdisk_part_info_t pinfo;
+        fdisk_label_info_t linfo;
+        bool create_label = false;
         bool dir_created = false;
         bool label_created = false;
-        capa_spec_t capa;
         service_id_t sid;
         errno_t rc;
@@ -480 +686 @@
         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;
+                }
         }
 
@@ -490 +719 @@
         sysinst_debug(sysinst, "sysinst_label_dev(): create partition");
 
-        rc = fdisk_part_get_max_avail(fdev, spc_pri, &capa);
-        if (rc != EOK) {
-                sysinst_error(sysinst,
-                    "Error getting available capacity.");
-                goto error;
-        }
-
-        fdisk_pspec_init(&pspec);
-        pspec.capacity = capa;
-        pspec.pkind = lpk_primary;
-        pspec.fstype = fs_ext4; /* Cannot be changed without modifying core.img */
-        pspec.mountp = MOUNT_POINT;
-        pspec.label = INST_VOL_LABEL;
-
-        rc = fdisk_part_create(fdev, &pspec, &part);
-        if (rc != EOK) {
-                sysinst_error(sysinst, "Error creating partition.");
-                goto error;
-        }
-
-        rc = fdisk_part_get_info(part, &pinfo);
-        if (rc != EOK) {
-                sysinst_error(sysinst, "Error getting partition information.");
-                goto error;
-        }
-
-        sysinst_debug(sysinst, "sysinst_label_dev(): OK");
-        fdisk_dev_close(fdev);
-        fdisk_destroy(fdisk);
-        sysinst->psvc_id = pinfo.svc_id;
+        /* Existing OS partition? */
+        rc = sysinst_existing_os_part_find(sysinst, fdev, &part);
+        if (rc == EOK) {
+                /* Open dialog to confirm that user wants to upgrade. */
+                rc = sysinst_upgrade_confirm_create(sysinst);
+                if (rc != EOK) {
+                        sysinst_error(sysinst, "Cannot create window.");
+                        goto error;
+                }
+
+                fibril_mutex_lock(&sysinst->responded_lock);
+                while (!sysinst->responded)
+                        fibril_condvar_wait(&sysinst->responded_cv,
+                            &sysinst->responded_lock);
+                fibril_mutex_unlock(&sysinst->responded_lock);
+
+                /* User decided not to upgrade existing installation? */
+                if (sysinst->quit) {
+                        (void)vfs_unlink_path(MOUNT_POINT);
+                        return 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;
+                }
+
+                /* 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. */
+                rc = sysinst_inst_part_create(sysinst, fdev);
+                if (rc != EOK)
+                        goto error;
+
+                /* performing initial OS installation */
+                sysinst->oper = sio_install;
+        }
+
         return EOK;
 error:
@@ -565 +813 @@
         char *path = NULL;
         const char **cp;
+        fmgt_flist_t *flist = NULL;
         int rv;
 
@@ -576 +825 @@
 
                 rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
-                if (rc != EOK) {
+                if (rc != EOK && rc != EEXIST) {
                         sysinst_error(sysinst, "Error creating directory.");
                         goto error;
@@ -590 +839 @@
 
         /* Copy initial configuration files */
-        rc = futil_rcopy_contents(sysinst->futil, CFG_FILES_SRC,
-            CFG_FILES_DEST);
-        if (rc != EOK)
-                return rc;
-
+
+        log_msg(LOG_DEFAULT, LVL_NOTE,
+            "sysinst_copy_boot_files(): copy initial configuration files");
+
+        rc = fmgt_flist_create(&flist);
+        if (rc != EOK)
+                goto error;
+
+        rc = fmgt_flist_append(flist, CFG_FILES_SRC);
+        if (rc != EOK)
+                goto error;
+
+        /* Do not overwrite configuration files. */
+        sysinst->overwrite = false;
+        rc = fmgt_copy(sysinst->fmgt, flist, CFG_FILES_DEST);
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error copying initial configuration "
+                    "files.");
+                goto error;
+        }
+
+        fmgt_flist_destroy(flist);
+        log_msg(LOG_DEFAULT, LVL_NOTE,
+            "sysinst_copy_boot_files(): copy initial configuration files OK");
         return EOK;
 error:
+        if (flist != NULL)
+                fmgt_flist_destroy(flist);
         if (path != NULL)
                 free(path);
@@ -608 +878 @@
 static errno_t sysinst_copy_boot_files(sysinst_t *sysinst)
 {
+        fmgt_flist_t *flist = NULL;
         errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_NOTE,
             "sysinst_copy_boot_files(): copy bootloader files");
-        rc = futil_rcopy_contents(sysinst->futil, BOOT_FILES_SRC, MOUNT_POINT);
-        if (rc != EOK)
-                return rc;
-
+        rc = fmgt_flist_create(&flist);
+        if (rc != EOK)
+                goto error;
+
+        rc = fmgt_flist_append(flist, BOOT_FILES_SRC);
+        if (rc != EOK)
+                goto error;
+
+        /* Overwrite boot files with new ones during upgrade. */
+        sysinst->overwrite = true;
+        rc = fmgt_copy(sysinst->fmgt, flist, MOUNT_POINT);
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error copying bootloader "
+                    "files.");
+                goto error;
+        }
+
+        fmgt_flist_destroy(flist);
         sysinst_debug(sysinst, "sysinst_copy_boot_files(): OK");
         return EOK;
+error:
+        if (flist != NULL)
+                fmgt_flist_destroy(flist);
+        return rc;
 }
 
@@ -731 +1020 @@
 }
 
+/** Return file contents as a heap-allocated block of bytes.
+ *
+ * @param srcp File path
+ * @param rdata Place to store pointer to data
+ * @param rsize Place to store size of data
+ *
+ * @return EOK on success, ENOENT if failed to open file, EIO on other
+ *         I/O error, ENOMEM if out of memory
+ */
+static errno_t sysinst_get_file(const char *srcp, void **rdata, size_t *rsize)
+{
+        int sf;
+        size_t nr;
+        errno_t rc;
+        size_t fsize;
+        char *data;
+        vfs_stat_t st;
+
+        rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
+        if (rc != EOK)
+                return ENOENT;
+
+        if (vfs_stat(sf, &st) != EOK) {
+                vfs_put(sf);
+                return EIO;
+        }
+
+        fsize = st.size;
+
+        data = calloc(fsize, 1);
+        if (data == NULL) {
+                vfs_put(sf);
+                return ENOMEM;
+        }
+
+        rc = vfs_read(sf, (aoff64_t []) { 0 }, data, fsize, &nr);
+        if (rc != EOK || nr != fsize) {
+                vfs_put(sf);
+                free(data);
+                return EIO;
+        }
+
+        (void) vfs_put(sf);
+        *rdata = data;
+        *rsize = fsize;
+
+        return EOK;
+}
+
 /** Copy boot blocks.
  *
@@ -756 +1094 @@
             "sysinst_copy_boot_blocks: Read boot block image.");
 
-        rc = futil_get_file(sysinst->futil,
-            BOOT_FILES_SRC "/boot/grub/i386-pc/boot.img",
+        rc = sysinst_get_file(BOOT_FILES_SRC "/grub/i386-pc/boot.img",
             &boot_img, &boot_img_size);
-        if (rc != EOK || boot_img_size != 512)
+        if (rc != EOK || boot_img_size != 512) {
+                sysinst_error(sysinst, "Error reading boot block image.");
                 return EIO;
+        }
 
         log_msg(LOG_DEFAULT, LVL_NOTE,
             "sysinst_copy_boot_blocks: Read GRUB core image.");
 
-        rc = futil_get_file(sysinst->futil,
-            BOOT_FILES_SRC "/boot/grub/i386-pc/core.img",
+        rc = sysinst_get_file(BOOT_FILES_SRC "/grub/i386-pc/core.img",
             &core_img, &core_img_size);
-        if (rc != EOK)
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error reading GRUB core image.");
                 return EIO;
+        }
 
         log_msg(LOG_DEFAULT, LVL_NOTE,
@@ -782 +1122 @@
 
         rc = block_init(sid);
-        if (rc != EOK)
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error opening block device.");
                 return rc;
+        }
 
         log_msg(LOG_DEFAULT, LVL_NOTE,
@@ -789 +1131 @@
 
         rc = block_get_bsize(sid, &bsize);
-        if (rc != EOK)
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error getting block size.");
                 return rc;
+        }
 
         if (bsize != 512) {
@@ -801 +1145 @@
 
         rc = block_read_direct(sid, BOOT_BLOCK_IDX, 1, bbuf);
-        if (rc != EOK)
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error reading boot block.");
                 return EIO;
+        }
 
         core_start = 16;
@@ -833 +1179 @@
 
         rc = block_write_direct(sid, BOOT_BLOCK_IDX, 1, bbuf);
-        if (rc != EOK)
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error writing boot block.");
                 return EIO;
+        }
 
         log_msg(LOG_DEFAULT, LVL_NOTE,
@@ -841 +1189 @@
         /* XXX Must pad last block with zeros */
         rc = block_write_direct(sid, core_start, core_blocks, core_img);
-        if (rc != EOK)
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error writing GRUB core blocks.");
                 return EIO;
+        }
 
         log_msg(LOG_DEFAULT, LVL_NOTE,
@@ -891 +1241 @@
         errno_t rc;
 
+        log_msg(LOG_DEFAULT, LVL_NOTE,
+            "sysinst_eject_phys_by_mp(%s)", path);
+
         rc = vol_create(&vol);
         if (rc != EOK) {
@@ -934 +1287 @@
         shutdown_failed = false;
 
+        sysinst_action(sysinst, "Restarting the system.");
+
         rc = system_open(SYSTEM_DEFAULT, &sysinst_system_cb, NULL, &system);
         if (rc != EOK) {
@@ -983 +1338 @@
 {
         errno_t rc;
+        bool clean_dev = false;
 
         sysinst_action(sysinst, "Creating device label and file system.");
@@ -988 +1344 @@
         rc = sysinst_label_dev(sysinst, dev);
         if (rc != EOK)
-                return rc;
+                goto error;
+        if (sysinst->quit)
+                return EOK;
+
+        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)
-                return rc;
+                goto error;
+
+        clean_dev = false;
 
         sysinst_action(sysinst, "Installing boot blocks.");
@@ -1015 +1377 @@
                 return rc;
 
-        sysinst_action(sysinst, "Ejecting installation media.");
-        rc = sysinst_eject_phys_by_mp(sysinst, CD_MOUNT_POINT);
-        if (rc != EOK)
-                return rc;
-
         return EOK;
+error:
+        if (clean_dev)
+                (void)sysinst_finish_dev(sysinst);
+        return rc;
 }
 
@@ -1055 +1416 @@
 
         sysinst_progress_destroy(sysinst->progress);
+        sysinst->progress = NULL;
+
+        /* User decided not to upgrade system? */
+        if (sysinst->quit) {
+                ui_quit(sysinst->ui);
+                return EOK;
+        }
+
         rc = sysinst_restart_dlg_create(sysinst);
         if (rc != EOK)
@@ -1095 +1464 @@
                 params.rect.p0.y = 0;
                 params.rect.p1.x = 64;
-                params.rect.p1.y = 5;
+                params.rect.p1.y = 7;
         } else {
                 params.rect.p0.x = 0;
                 params.rect.p0.y = 0;
                 params.rect.p1.x = 500;
-                params.rect.p1.y = 60;
+                params.rect.p1.y = 90;
         }
 
@@ -1126 +1495 @@
         }
 
+        /* Installing/upgrading system line */
         rc = ui_label_create(ui_res, "Installing system. Please wait...",
             &progress->label);
@@ -1158 +1528 @@
         }
 
+        /* Action line */
         rc = ui_label_create(ui_res, "",
             &progress->action);
@@ -1169 +1540 @@
                 rect.p0.y = 3;
                 rect.p1.x = arect.p1.x;
+                rect.p1.y = 4;
+        } else {
+                rect.p0.x = arect.p0.x;
+                rect.p0.y = 40;
+                rect.p1.x = arect.p1.x;
+                rect.p1.y = 60;
+        }
+        ui_label_set_rect(progress->action, &rect);
+        ui_label_set_halign(progress->action, gfx_halign_center);
+        ui_label_set_valign(progress->action, gfx_valign_top);
+
+        rc = ui_fixed_add(fixed, ui_label_ctl(progress->action));
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error adding control to layout.");
+                ui_label_destroy(progress->label);
+                progress->label = NULL;
+                goto error;
+        }
+
+        /* Progress line */
+        rc = ui_label_create(ui_res, "",
+            &progress->progress);
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error creating label.");
+                goto error;
+        }
+
+        if (ui_is_textmode(sysinst->ui)) {
+                rect.p0.x = arect.p0.x;
+                rect.p0.y = 5;
+                rect.p1.x = arect.p1.x;
                 rect.p1.y = arect.p1.y;
         } else {
                 rect.p0.x = arect.p0.x;
-                rect.p0.y = 30;
+                rect.p0.y = 70;
                 rect.p1.x = arect.p1.x;
                 rect.p1.y = arect.p1.y;
         }
-        ui_label_set_rect(progress->action, &rect);
-        ui_label_set_halign(progress->action, gfx_halign_center);
-        ui_label_set_valign(progress->action, gfx_valign_center);
-
-        rc = ui_fixed_add(fixed, ui_label_ctl(progress->action));
+        ui_label_set_rect(progress->progress, &rect);
+        ui_label_set_halign(progress->progress, gfx_halign_center);
+        ui_label_set_valign(progress->progress, gfx_valign_top);
+
+        rc = ui_fixed_add(fixed, ui_label_ctl(progress->progress));
         if (rc != EOK) {
                 sysinst_error(sysinst, "Error adding control to layout.");
@@ -1226 +1628 @@
 }
 
-/** Set current action message.
- *
- * @param sysinst System installer
- * @param action Action text
- */
-static void sysinst_action(sysinst_t *sysinst, const char *action)
-{
+/** Set current progress message.
+ *
+ * @param sysinst System installer
+ * @param progress Progress text
+ */
+static void sysinst_progress(sysinst_t *sysinst, const char *progress)
+{
+        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", progress);
+
         if (sysinst->progress == NULL)
                 return;
 
+        ui_label_set_text(sysinst->progress->progress, progress);
+        ui_label_paint(sysinst->progress->progress);
+}
+
+/** Set current action message.
+ *
+ * @param sysinst System installer
+ * @param action Action text
+ */
+static void sysinst_action(sysinst_t *sysinst, const char *action)
+{
+        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);
+
+        if (sysinst->progress == NULL)
+                return;
+
         ui_label_set_text(sysinst->progress->action, action);
         ui_label_paint(sysinst->progress->action);
-        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);
 }
 
@@ -1311 +1730 @@
 }
 
-/** Create restart dialog.
- *
- * @param sysinst System installer
- * @return EOK on success or an error code
- */
-static errno_t sysinst_restart_dlg_create(sysinst_t *sysinst)
+/** Create upgrade confirmation dialog.
+ *
+ * @param sysinst System installer
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_upgrade_confirm_create(sysinst_t *sysinst)
 {
         ui_msg_dialog_params_t params;
@@ -1323 +1742 @@
 
         ui_msg_dialog_params_init(&params);
+        params.caption = "System upgrade";
+        params.text = "Existing installation found. "
+            "Do you want to upgrade it?";
+        params.choice = umdc_ok_cancel;
+        params.flags |= umdf_topmost | umdf_center;
+
+        rc = ui_msg_dialog_create(sysinst->ui, &params, &dialog);
+        if (rc != EOK)
+                return rc;
+
+        ui_msg_dialog_set_cb(dialog, &sysinst_upgrade_confirm_cb, sysinst);
+        return EOK;
+}
+
+/** Create restart dialog.
+ *
+ * @param sysinst System installer
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_restart_dlg_create(sysinst_t *sysinst)
+{
+        ui_msg_dialog_params_t params;
+        ui_msg_dialog_t *dialog;
+        errno_t rc;
+
+        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;
@@ -1352 +1802 @@
                 return ENOMEM;
 
-        rc = futil_create(&sysinst_futil_cb, (void *)sysinst, &sysinst->futil);
+        fibril_condvar_initialize(&sysinst->responded_cv);
+        fibril_mutex_initialize(&sysinst->responded_lock);
+
+        rc = fmgt_create(&sysinst->fmgt);
         if (rc != EOK) {
                 printf("Out of memory.\n");
                 goto error;
         }
+
+        fmgt_set_cb(sysinst->fmgt, &sysinst_fmgt_cb, (void *)sysinst);
+        fmgt_set_init_update(sysinst->fmgt, true);
 
         rc = ui_create(display_spec, &ui);
@@ -1400 +1856 @@
         }
 
-        (void)sysinst_confirm_create(sysinst);
+        rc = sysinst_confirm_create(sysinst);
+        if (rc != EOK) {
+                printf("Error creating window.\n");
+                goto error;
+        }
 
         ui_run(ui);
@@ -1413 +1873 @@
         return EOK;
 error:
-        if (sysinst->futil != NULL)
-                futil_destroy(sysinst->futil);
+        if (sysinst->fmgt != NULL)
+                fmgt_destroy(sysinst->fmgt);
         if (sysinst->system != NULL)
                 system_close(sysinst->system);