From 5a28aee434462be93f31810ad1f8a4465fe89ade Mon Sep 17 00:00:00 2001
From: Abdul Karim <Abdul.Karim@morganstanley.com>
Date: Fri, 2 Aug 2024 22:12:06 +0100
Subject: [PATCH] aii/ks: support for sending mail in el9 using correct s-nail
 format

Current mailx options used in aii doesn't seem to send mail when s-nail is used,
provide correct options when s-nail binary exists.
---
 aii-ks/src/main/perl/ks.pm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/aii-ks/src/main/perl/ks.pm b/aii-ks/src/main/perl/ks.pm
index 99de5a1b..476aedd2 100755
--- a/aii-ks/src/main/perl/ks.pm
+++ b/aii-ks/src/main/perl/ks.pm
@@ -1079,6 +1079,9 @@ sub kspostreboot_header
 
     my $mailx_smtp = "";
     $mailx_smtp .= " smtp=$tree->{mail}->{smtp}" if $tree->{mail}->{smtp};
+    # support for s-nail on el9
+    my $snail_smtp = "";
+    $snail_smtp .= "  -Smta=smtp://$tree->{mail}->{smtp}" if $tree->{mail}->{smtp};
 
     print <<EOF;
 #!/bin/bash
@@ -1099,7 +1102,11 @@ fail() {
     echo "Quattor installation on $fqdn failed: \\\$1"
     subject="[\\`date +'%x %R %z'\\`] Quattor installation on $fqdn failed: \\\$1"
     if [ -x /usr/bin/mailx ]; then
-        env MAILRC=/dev/null from=root\@$fqdn $mailx_smtp mailx -s "\\\$subject" $rootmail <<End_of_mailx
+        mailx_options="from=root\@$fqdn $mailx_smtp mailx"
+        if [ -x /usr/bin/s-nail ]; then
+            mailx_options="mailx -:/ -Sfrom=root\@$fqdn $snail_smtp"
+        fi
+        env MAILRC=/dev/null \\\$mailx_options -s "\\\$subject" $rootmail <<End_of_mailx
 
 \\`cat $logfile\\`
 ------------------------------------------------------------
@@ -1132,7 +1139,11 @@ success() {
 
     subject="[\\`date +'%x %R %z'\\`] Quattor installation on $fqdn succeeded"
     if [ -x /usr/bin/mailx ]; then
-        env MAILRC=/dev/null from=root\@$fqdn $mailx_smtp mailx -s "\\\$subject" $rootmail <<End_of_mailx
+        mailx_options="from=root\@$fqdn $mailx_smtp mailx"
+        if [ -x /usr/bin/s-nail ]; then
+            mailx_options="mailx -:/ -Sfrom=root\@$fqdn $snail_smtp"
+        fi
+        env MAILRC=/dev/null \\\$mailx_options -s "\\\$subject" $rootmail <<End_of_mailx
 
 Node $fqdn successfully installed.