Check for running inside RHEL and adjust the logging options.

It seems like at least RHEL does not have the "--stderr" option
but instead only supports the short version "-s" so add a check 
that will switch from the long version to the short version when
RHEL is detected.

LP: #1083715

1 files changed, 16 insertions, 3 deletions

diff --git a/tools/write-ssh-key-fingerprints b/tools/write-ssh-key-fingerprints
index aa1f3c38..d69c7fcc 100755
--- a/tools/write-ssh-key-fingerprints
+++ b/tools/write-ssh-key-fingerprints
@@ -1,5 +1,18 @@
 #!/bin/sh
+
+logger_opts="-p user.info -t ec2"
+
+if [ -f "/etc/redhat-release" ]
+then
+    # Seems like rhel only supports the short version
+    logger_opts="$logger_opts -s"
+else
+    logger_opts="$logger_opts --stderr"
+fi
+
+# Redirect stderr to stdout
 exec 2>&1
+
 fp_blist=",${1},"
 key_blist=",${2},"
 {
@@ -16,9 +29,9 @@ done
 echo "-----END SSH HOST KEY FINGERPRINTS-----"
 echo "#############################################################"
 
-} | logger -p user.info --stderr -t "ec2"
+} | logger $logger_opts
 
-echo -----BEGIN SSH HOST KEY KEYS-----
+echo "-----BEGIN SSH HOST KEY KEYS-----"
 for f in /etc/ssh/ssh_host_*key.pub; do
     [ -f "$f" ] || continue
     read ktype line < "$f"
@@ -26,4 +39,4 @@ for f in /etc/ssh/ssh_host_*key.pub; do
     [ "${key_blist#*,$ktype,}" = "${key_blist}" ] || continue
     cat $f
 done
-echo -----END SSH HOST KEY KEYS-----
+echo "-----END SSH HOST KEY KEYS-----"