Changeset 2c21595 in mainline

Timestamp:

2026-04-24T12:42:40Z (16 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

2866531

Parents:

e2b47b3c

git-author:

Jiri Svoboda <jiri@…> (2026-04-24 17:42:24)

git-committer:

Jiri Svoboda <jiri@…> (2026-04-24 12:42:40)

Message:

Do not overwrite configuration files during upgrade.

Location:

uspace/app/sysinst

Files:

• sysinst.c (modified) (3 diffs)
• sysinst.h (modified) (1 diff)

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) {

uspace/app/sysinst/sysinst.h

@@ -86 +86 @@
         bool quit;
         char errmsg[128];
+        /** Allow overwriting files in current copy operation. */
+        bool overwrite;
 } sysinst_t;