From e58074ad4ad3245470d43f7ec7289cd052f0ec4b Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 30 Sep 2021 17:42:07 -0400
Subject: [PATCH] Update doxcat discovery script to run on Fedora34 generated
 image

---
 xCAT-genesis-scripts/usr/bin/doxcat | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xCAT-genesis-scripts/usr/bin/doxcat b/xCAT-genesis-scripts/usr/bin/doxcat
index 505c3c6bc..0f2e76af9 100755
--- a/xCAT-genesis-scripts/usr/bin/doxcat
+++ b/xCAT-genesis-scripts/usr/bin/doxcat
@@ -17,6 +17,8 @@ fi
 if [ -f /var/run/rsyslogd.pid ]; then
     kill -TERM `cat /var/run/rsyslogd.pid`
 fi
+# wait for rsyslog to terminate
+sleep 2
 
 if [ $RSYSLOGD_VERSION -ge 8 ]; then
     /sbin/rsyslogd
@@ -82,6 +84,10 @@ if [ $? -ne 0 ]; then
 	ssh-keygen -q -t dsa -f /etc/ssh/ssh_host_dsa_key -C '' -N ''
 fi
 
+# On some systems /usr/share/empty.sshd needs to be created before calling sshd
+if [ ! -e /usr/share/empty.sshd ]; then
+    mkdir -p /usr/share/empty.sshd
+fi
 echo 'Protocol 2' >> /etc/ssh/sshd_config
 /usr/sbin/sshd
 mkdir -p /etc/xcat
@@ -300,6 +306,8 @@ fi
 if [ -f /var/run/rsyslogd.pid ]; then
     kill -TERM `cat /var/run/rsyslogd.pid`
 fi
+# wait for rsyslog to terminate
+sleep 2
 
 if [ "$RSYSLOGD_VERSION" -ge 8 ]; then
     /sbin/rsyslogd