Changes in / [a4f8c3f:4708060d] in mainline

Location:

uspace

Files:

• app/sysinst/sysinst.c (modified) (12 diffs)
• drv/hid/usbhid/mouse/mousedev.c (modified) (2 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;
@@ -592 +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;
@@ -613 +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");
@@ -891 +900 @@
         errno_t rc;
 
+        log_msg(LOG_DEFAULT, LVL_NOTE,
+            "sysinst_eject_phys_by_mp(%s)", path);
+
         rc = vol_create(&vol);
         if (rc != EOK) {
@@ -934 +946 @@
         shutdown_failed = false;
 
+        sysinst_action(sysinst, "Restarting the system.");
+
         rc = system_open(SYSTEM_DEFAULT, &sysinst_system_cb, NULL, &system);
         if (rc != EOK) {
@@ -983 +997 @@
 {
         errno_t rc;
+        bool clean_dev = false;
 
         sysinst_action(sysinst, "Creating device label and file system.");
@@ -988 +1003 @@
         rc = sysinst_label_dev(sysinst, dev);
         if (rc != EOK)
-                return rc;
+                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)
-                return rc;
+                goto error;
+
+        clean_dev = false;
 
         sysinst_action(sysinst, "Installing boot blocks.");
@@ -1015 +1034 @@
                 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;
+        return EOK;
+error:
+        if (clean_dev)
+                (void)sysinst_finish_dev(sysinst);
+        return rc;
 }
 
@@ -1055 +1073 @@
 
         sysinst_progress_destroy(sysinst->progress);
+        sysinst->progress = NULL;
+
         rc = sysinst_restart_dlg_create(sysinst);
         if (rc != EOK)
@@ -1233 +1253 @@
 static void sysinst_action(sysinst_t *sysinst, const char *action)
 {
+        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);
+
         if (sysinst->progress == NULL)
                 return;
@@ -1238 +1260 @@
         ui_label_set_text(sysinst->progress->action, action);
         ui_label_paint(sysinst->progress->action);
-        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);
 }
 

uspace/drv/hid/usbhid/mouse/mousedev.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Lubos Slovak, Vojtech Horky
  * Copyright (c) 2018 Ondrej Hlavaty
@@ -166 +167 @@
         assert(mouse_dev != NULL);
 
-        if (mouse_dev->mouse_sess == NULL) {
-                usb_log_warning(NAME " No console session.");
-                return;
-        }
+        if (mouse_dev->mouse_sess == NULL)
+                return;
 
         const usb_hid_report_field_t *move_x = get_mouse_axis_move_field(