Changes in uspace/app/sysinst/sysinst.c [5df2570:2c21595] in mainline

File:

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

uspace/app/sysinst/sysinst.c

@@ -423 +423 @@
 {
         sysinst_t *sysinst = (sysinst_t *)arg;
+
         (void)sysinst;
         (void)exists->fname;
-        // XXX Do not overwrite configuration files.
-        return fmgt_exr_overwrite;
+
+        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;
 }
 
@@ -841 +851 @@
                 goto error;
 
+        /* Do not overwrite configuration files. */
+        sysinst->overwrite = false;
         rc = fmgt_copy(sysinst->fmgt, flist, CFG_FILES_DEST);
         if (rc != EOK) {
@@ -879 +891 @@
                 goto error;
 
+        /* Overwrite boot files with new ones during upgrade. */
+        sysinst->overwrite = true;
         rc = fmgt_copy(sysinst->fmgt, flist, MOUNT_POINT);
         if (rc != EOK) {