Merge pull request #596 from nadvornik/migration-fix

Fix migration of autoinstallable distributions (bsc#1243802)

Author: nadvornik

mgradm/shared/podman/podman.go

@@ -565,7 +565,7 @@ func Migrate(
 
 	schemaUpdateRequired :=
 		oldPgVersion != newPgVersion
-	if err := RunPgsqlFinalizeScript(preparedServerImage, schemaUpdateRequired, false); err != nil {
+	if err := RunPgsqlFinalizeScript(preparedServerImage, schemaUpdateRequired, true); err != nil {
 		return utils.Errorf(err, L("cannot run PostgreSQL finalize script"))
 	}
 

mgradm/shared/templates/migrateScriptTemplate.go

@@ -40,6 +40,9 @@ $SSH {{ .SourceFqdn }} "sudo systemctl stop postgresql.service"
 while IFS="," read -r target path ; do
   if $SSH -n {{ .SourceFqdn }} test -e "$path" ; then
     echo "-/ $path"
+
+    # protect the targets that can be already synced in --prepare phase
+    echo "P/ /srv/www/distributions/$target"
   fi
 done < distros > exclude_list
 

uyuni-tools.changes.nadvornik.migration-fix

@@ -0,0 +1 @@
+- Fix migration of autoinstallable distributions (bsc#1243802)