Changeset 0cec807a in mainline for uspace/app/sysinst/sysinst.c

Timestamp:

2025-05-06T16:18:58Z (8 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

61f28c4

Parents:

21cd0c8

Message:

Unmount destination volume and delete mount point on installation failure.

File:

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

uspace/app/sysinst/sysinst.c

@@ -592 +592 @@
         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 +616 @@
             "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");
@@ -983 +989 @@
 {
         errno_t rc;
+        bool clean_dev = false;
 
         sysinst_action(sysinst, "Creating device label and file system.");
@@ -988 +995 @@
         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.");
@@ -1021 +1032 @@
 
         return EOK;
+error:
+        if (clean_dev)
+                (void)sysinst_finish_dev(sysinst);
+        return rc;
 }