smeserver-affa/contribs10/smeserver-affa-fix-ssh-knownhosts-error.patch

diff -ruN smeserver-affa-3.3.1.old/root/sbin/affa smeserver-affa-3.3.1/root/sbin/affa
--- smeserver-affa-3.3.1/root/sbin/affa 2022-06-30 22:12:38.431783734 +0100
+++ smeserver-affa-3.3.1.new/root/sbin/affa     2022-06-30 22:02:23.716590756 +0100
@@ -1387,7 +1383,7 @@
 
 #### ligne suivante: rajouté $jobname
         remoteCopy( $jobname, "/sbin/e-smith/affa-rpmlist.sh", "/sbin/e-smith/affa-rpmlist.sh" );
-        @cmd = ( '/usr/bin/ssh', '-p', $job{'sshPort'}, '-i', '/root/.ssh/id_rsa_affa', '-o', "HostKeyAlias=$jobname", $sshQuiet, $job{'remoteHostName'}, "'/sbin/e-smith/affa-rpmlist.sh>$rpmlist'"
+        @cmd = ( '/usr/bin/ssh', '-p', $job{'sshPort'}, '-i', '/root/.ssh/id_rsa_affa', '-o', "HostKeyAlias=$jobname", '-o', "UserKnownHostsFile=/root/.ssh/knownhosts-$jobname", $sshQuiet, $job{'remoteHostName'}, "'/sbin/e-smith/affa-rpmlist.sh>$rpmlist'"
         );
     }
     not ExecCmd( @cmd, 0 ) or affaErrorExit("writing list of installed RPMs failed.");
@@ -1696,7 +1692,7 @@
     close(WDS);
     close(WD);
     chmod( 0700, "/tmp/$$.$WDName" );
-    my @cmd = ( '/usr/bin/ssh', '-p', $job{'sshPort'}, '-i', '/root/.ssh/id_rsa_affa', '-o', "HostKeyAlias=$jobname", $job{'remoteHostName'}, "/bin/rm", "-f", "/etc/cron.hourly/$WDName-reminder"
+    my @cmd = ( '/usr/bin/ssh', '-p', $job{'sshPort'}, '-i', '/root/.ssh/id_rsa_affa', '-o', "HostKeyAlias=$jobname", '-o', "UserKnownHostsFile=/root/.ssh/knownhosts-$jobname", $job{'remoteHostName'}, "/bin/rm", "-f", "/etc/cron.hourly/$WDName-reminder"
     );
     not ExecCmd( @cmd, 0 ) or affaErrorExit("Couldn't delete /etc/cron.hourly/$WDName-reminder on remote host.");
 ##### ligne suivante: ajouté $jobname
@@ -1729,7 +1725,7 @@
 
 #### ligne suivante: ajouté $jobname
     remoteCopy( $jobname, "/usr/lib/affa/$WDName", "/tmp/" );
-    my @cmd = ( '/usr/bin/ssh', '-p', $job{'sshPort'}, '-i', '/root/.ssh/id_rsa_affa', '-o', "HostKeyAlias=$jobname", $sshQuiet, $job{'remoteHostName'}, "/tmp/$WDName"
+    my @cmd = ( '/usr/bin/ssh', '-p', $job{'sshPort'}, '-i', '/root/.ssh/id_rsa_affa', '-o', "HostKeyAlias=$jobname", '-o', "UserKnownHostsFile=/root/.ssh/knownhosts-$jobname", $sshQuiet, $job{'remoteHostName'}, "/tmp/$WDName"
     );
     not ExecCmd( @cmd, 0 ) or affaErrorExit("Couldn't run /usr/lib/affa/$WDName on remote host.");
 }
1	jcrisp	1.1	diff -ruN smeserver-affa-3.3.1.old/root/sbin/affa smeserver-affa-3.3.1/root/sbin/affa
2			--- smeserver-affa-3.3.1/root/sbin/affa 2022-06-30 22:12:38.431783734 +0100
3			+++ smeserver-affa-3.3.1.new/root/sbin/affa 2022-06-30 22:02:23.716590756 +0100
4			@@ -1387,7 +1383,7 @@
5
6			#### ligne suivante: rajouté $jobname
7			remoteCopy( $jobname, "/sbin/e-smith/affa-rpmlist.sh", "/sbin/e-smith/affa-rpmlist.sh" );
8			- @cmd = ( '/usr/bin/ssh', '-p', $job{'sshPort'}, '-i', '/root/.ssh/id_rsa_affa', '-o', "HostKeyAlias=$jobname", $sshQuiet, $job{'remoteHostName'}, "'/sbin/e-smith/affa-rpmlist.sh>$rpmlist'"
9			+ @cmd = ( '/usr/bin/ssh', '-p', $job{'sshPort'}, '-i', '/root/.ssh/id_rsa_affa', '-o', "HostKeyAlias=$jobname", '-o', "UserKnownHostsFile=/root/.ssh/knownhosts-$jobname", $sshQuiet, $job{'remoteHostName'}, "'/sbin/e-smith/affa-rpmlist.sh>$rpmlist'"
10			);
11			}
12			not ExecCmd( @cmd, 0 ) or affaErrorExit("writing list of installed RPMs failed.");
13			@@ -1696,7 +1692,7 @@
14			close(WDS);
15			close(WD);
16			chmod( 0700, "/tmp/$$.$WDName" );
17			- my @cmd = ( '/usr/bin/ssh', '-p', $job{'sshPort'}, '-i', '/root/.ssh/id_rsa_affa', '-o', "HostKeyAlias=$jobname", $job{'remoteHostName'}, "/bin/rm", "-f", "/etc/cron.hourly/$WDName-reminder"
18			+ my @cmd = ( '/usr/bin/ssh', '-p', $job{'sshPort'}, '-i', '/root/.ssh/id_rsa_affa', '-o', "HostKeyAlias=$jobname", '-o', "UserKnownHostsFile=/root/.ssh/knownhosts-$jobname", $job{'remoteHostName'}, "/bin/rm", "-f", "/etc/cron.hourly/$WDName-reminder"
19			);
20			not ExecCmd( @cmd, 0 ) or affaErrorExit("Couldn't delete /etc/cron.hourly/$WDName-reminder on remote host.");
21			##### ligne suivante: ajouté $jobname
22			@@ -1729,7 +1725,7 @@
23
24			#### ligne suivante: ajouté $jobname
25			remoteCopy( $jobname, "/usr/lib/affa/$WDName", "/tmp/" );
26			- my @cmd = ( '/usr/bin/ssh', '-p', $job{'sshPort'}, '-i', '/root/.ssh/id_rsa_affa', '-o', "HostKeyAlias=$jobname", $sshQuiet, $job{'remoteHostName'}, "/tmp/$WDName"
27			+ my @cmd = ( '/usr/bin/ssh', '-p', $job{'sshPort'}, '-i', '/root/.ssh/id_rsa_affa', '-o', "HostKeyAlias=$jobname", '-o', "UserKnownHostsFile=/root/.ssh/knownhosts-$jobname", $sshQuiet, $job{'remoteHostName'}, "/tmp/$WDName"
28			);
29			not ExecCmd( @cmd, 0 ) or affaErrorExit("Couldn't run /usr/lib/affa/$WDName on remote host.");
30			}