Merge pull request #223 from nadvornik/distro-fix

Fixed migration of multiple autoinstallable distributions
uyuni-project · Mar 28, 2024 · 3273c4e · 3273c4e
2 parents 9987d71 + 7e5089b
commit 3273c4e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/mgradm/shared/templates/migrateScriptTemplate.go b/mgradm/shared/templates/migrateScriptTemplate.go
@@ -61,8 +61,9 @@ sed -i -e 's|appBase="webapps"|appBase="/usr/share/susemanager/www/tomcat/webapp
 sed -i -e 's|DocumentRoot\s*"/srv/www/htdocs"|DocumentRoot "/usr/share/susemanager/www/htdocs"|' /etc/apache2/vhosts.d/vhost-ssl.conf
 
 echo "Migrating auto-installable distributions..."
+
 while IFS="," read -r target path ; do
-  if $SSH -A {{ .SourceFqdn }} test -e $path; then
+  if $SSH -n {{ .SourceFqdn }} test -e $path ; then
     echo "Copying distribution $target from $path"
     mkdir -p "/srv/www/distributions/$target"
     rsync -e "$SSH" --rsync-path='sudo rsync' -avz "{{ .SourceFqdn }}:$path/" "/srv/www/distributions/$target"

diff --git a/uyuni-tools.changes.nadvornik.distro-fix b/uyuni-tools.changes.nadvornik.distro-fix
@@ -0,0 +1 @@
+- Fixed migration of multiple autoinstallable distributions
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Fixed migration of multiple autoinstallable distributions