Changes in uspace/app/sysinst/sysinst.c [61f28c4:629b480] in mainline

File:

• uspace/app/sysinst/sysinst.c (modified) (12 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 = {
@@ -273 +272 @@
         case 0:
                 /* OK */
-                sysinst_action(sysinst, "Ejecting installation media.");
-                (void)sysinst_eject_phys_by_mp(sysinst, CD_MOUNT_POINT);
                 (void)sysinst_restart(sysinst);
                 break;
@@ -595 +592 @@
         rc = futil_rcopy_contents(sysinst->futil, CFG_FILES_SRC,
             CFG_FILES_DEST);
-        if (rc != EOK) {
-                sysinst_error(sysinst, "Error copying initial configuration "
-                    "files.");
-                return rc;
-        }
+        if (rc != EOK)
+                return rc;
 
         return EOK;
@@ -619 +613 @@
             "sysinst_copy_boot_files(): copy bootloader files");
         rc = futil_rcopy_contents(sysinst->futil, BOOT_FILES_SRC, MOUNT_POINT);
-        if (rc != EOK) {
-                sysinst_error(sysinst, "Error copying bootloader "
-                    "files.");
-                return rc;
-        }
+        if (rc != EOK)
+                return rc;
 
         sysinst_debug(sysinst, "sysinst_copy_boot_files(): OK");
@@ -900 +891 @@
         errno_t rc;
 
-        log_msg(LOG_DEFAULT, LVL_NOTE,
-            "sysinst_eject_phys_by_mp(%s)", path);
-
         rc = vol_create(&vol);
         if (rc != EOK) {
@@ -946 +934 @@
         shutdown_failed = false;
 
-        sysinst_action(sysinst, "Restarting the system.");
-
         rc = system_open(SYSTEM_DEFAULT, &sysinst_system_cb, NULL, &system);
         if (rc != EOK) {
@@ -997 +983 @@
 {
         errno_t rc;
-        bool clean_dev = false;
 
         sysinst_action(sysinst, "Creating device label and file system.");
@@ -1003 +988 @@
         rc = sysinst_label_dev(sysinst, dev);
         if (rc != EOK)
-                goto error;
-
-        clean_dev = true;
+                return rc;
 
         sysinst_action(sysinst, "Creating system directory structure.");
         rc = sysinst_setup_sysvol(sysinst);
         if (rc != EOK)
-                goto error;
+                return rc;
 
         sysinst_action(sysinst, "Copying boot files.");
         rc = sysinst_copy_boot_files(sysinst);
         if (rc != EOK)
-                goto error;
+                return rc;
 
         sysinst_action(sysinst, "Configuring the system.");
         rc = sysinst_customize_initrd(sysinst);
         if (rc != EOK)
-                goto error;
+                return rc;
 
         sysinst_action(sysinst, "Finishing system volume.");
         rc = sysinst_finish_dev(sysinst);
         if (rc != EOK)
-                goto error;
-
-        clean_dev = false;
+                return rc;
 
         sysinst_action(sysinst, "Installing boot blocks.");
@@ -1034 +1015 @@
                 return rc;
 
-        return EOK;
-error:
-        if (clean_dev)
-                (void)sysinst_finish_dev(sysinst);
-        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;
 }
 
@@ -1073 +1055 @@
 
         sysinst_progress_destroy(sysinst->progress);
-        sysinst->progress = NULL;
-
         rc = sysinst_restart_dlg_create(sysinst);
         if (rc != EOK)
@@ -1253 +1233 @@
 static void sysinst_action(sysinst_t *sysinst, const char *action)
 {
-        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);
-
         if (sysinst->progress == NULL)
                 return;
@@ -1260 +1238 @@
         ui_label_set_text(sysinst->progress->action, action);
         ui_label_paint(sysinst->progress->action);
+        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);
 }