Merge branch 'restore-multipath-conf' into 10.10.9-8.3

* xcpng/restore-multipath-conf: Keep user multipath configuration upon upgrade
xcp-ng · Jul 2, 2024 · 7f4fff2 · 7f4fff2
2 parents aba1678 + bb6f238
commit 7f4fff2
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/upgrade.py b/upgrade.py
@@ -592,6 +592,9 @@ def buildRestoreList(self, src_base):
         # Keep IPv6 enablement/disablement upon upgrades
         self.restore_list += ['etc/sysctl.d/91-net-ipv6.conf']
 
+        # Keep user multipath configuration
+        self.restore_list += [{'dir': 'etc/multipath/conf.d', 're': re.compile(r'custom.*\.conf')}]
+
     completeUpgradeArgs = ['mounts', 'installation-to-overwrite', 'primary-disk', 'backup-partnum', 'logs-partnum', 'net-admin-interface', 'net-admin-bridge', 'net-admin-configuration']
     def completeUpgrade(self, mounts, prev_install, target_disk, backup_partnum, logs_partnum, admin_iface, admin_bridge, admin_config):