Merge pull request #25 from xcp-ng/restore-multipath-conf

fixup! Keep user multipath configuration upon upgrade
xcp-ng · Dec 22, 2023 · 31c5c21 · 31c5c21
2 parents 7485aeb + f5530b5
commit 31c5c21
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/upgrade.py b/upgrade.py
@@ -452,7 +452,7 @@ def buildRestoreList(self):
         self.restore_list += ['etc/sysctl.d/91-net-ipv6.conf']
 
         # Keep user multipath configuration
-        self.restore_list += [{'dir': 'etc/multipath/conf.d', 're': r'custom.*\.conf'}]
+        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):