From d6f0c89d435d353161fadbd2fd5286c6b82c82a5 Mon Sep 17 00:00:00 2001
From: Patrick Lundgren <pdlun92@gmail.com>
Date: Wed, 13 Jul 2016 14:36:30 -0400
Subject: [PATCH 1/2] Added block to restart rsyslogd after dhclient has been
 restarted. Moved restart to xCAT-genesis-scripts

---
 .../bin}/restart                                     | 12 ++++++++++++
 xCAT-genesis-scripts/xCAT-genesis-scripts.spec       |  1 +
 2 files changed, 13 insertions(+)
 rename {xCAT-genesis-builder => xCAT-genesis-scripts/bin}/restart (88%)

diff --git a/xCAT-genesis-builder/restart b/xCAT-genesis-scripts/bin/restart
similarity index 88%
rename from xCAT-genesis-builder/restart
rename to xCAT-genesis-scripts/bin/restart
index 2a235c788..a51157e4a 100755
--- a/xCAT-genesis-builder/restart
+++ b/xCAT-genesis-scripts/bin/restart
@@ -42,6 +42,18 @@ while [ $WAITING -gt 0 ]; do
        sleep 1
        echo -en "Waiting $i seconds for DHCP changes to take effect    \r"
     done
+    
+    # restart rsyslog after dhclient
+    kill -9 `cat /var/run/syslogd.pid`
+    sleep 3
+    RSYSLOGD_VERSION=`rsyslogd -v | grep "rsyslogd" | cut -d" " -f2 | cut -d"." -f1`
+    if [ $RSYSLOGD_VERSION -ge 8 ]; then
+        # Newer versions of rsyslogd do not support -c flag anymore
+        /sbin/rsyslogd
+    else
+        /sbin/rsyslogd -c4
+    fi
+
     WAITING=0
     if [ ! -z "$FORCENICS" ]; then
         #for nic in `ifconfig|grep HWaddr|awk '{print $1}'|egrep "$FORCENICS"`; do
diff --git a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
index e37fe4995..0ffa1c825 100755
--- a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
+++ b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
@@ -98,6 +98,7 @@ touch /etc/xcat/genesis-scripts-updated
 %{rpminstallroot}/bin/pseries_platform
 %{rpminstallroot}/bin/update_flash
 %{rpminstallroot}/bin/update_flash_nv
+%{rpminstallroot}/bin/restart
 %{rpminstallroot}/debian/changelog
 %{rpminstallroot}/debian/compat
 %{rpminstallroot}/debian/control

From 3d0d83c8914c8518d7cc4adeab740deae25a5494 Mon Sep 17 00:00:00 2001
From: Patrick Lundgren <pdlun92@gmail.com>
Date: Tue, 19 Jul 2016 10:14:40 -0400
Subject: [PATCH 2/2] Removed /bin/restart from install config files

---
 xCAT-genesis-builder/install        | 1 -
 xCAT-genesis-builder/install.ubuntu | 1 -
 2 files changed, 2 deletions(-)

diff --git a/xCAT-genesis-builder/install b/xCAT-genesis-builder/install
index c5020fc42..67e6950fa 100755
--- a/xCAT-genesis-builder/install
+++ b/xCAT-genesis-builder/install
@@ -584,7 +584,6 @@ dracut_install /usr/share/zoneinfo/posix/PRC
 dracut_install /usr/share/zoneinfo/posix/Chile/EasterIsland
 dracut_install /usr/share/zoneinfo/posix/Chile/Continental
 inst "$moddir/xcatroot" "/sbin/xcatroot"
-inst "$moddir/restart" "/bin/restart"
 inst "$moddir/dhclient.conf" "/etc/dhclient.conf"
 inst "$moddir/dhclient-script" "/sbin/dhclient-script"
 inst "$moddir/rsyslog.conf" "/etc/rsyslog.conf"
diff --git a/xCAT-genesis-builder/install.ubuntu b/xCAT-genesis-builder/install.ubuntu
index a329cd0cc..9ae3f5af2 100755
--- a/xCAT-genesis-builder/install.ubuntu
+++ b/xCAT-genesis-builder/install.ubuntu
@@ -612,7 +612,6 @@ inst "$moddir/allowcred.awk" "/bin/allowcred.awk"
 inst "$moddir/getipmi" "/bin/getipmi"
 inst "$moddir/remoteimmsetup" "/bin/remoteimmsetup"
 inst "$moddir/getdestiny" "/bin/getdestiny"
-inst "$moddir/restart" "/bin/restart"
 inst "$moddir/doxcat" "/bin/doxcat"
 inst "$moddir/nextdestiny" "/bin/nextdestiny"
 inst "$moddir/getcert" "/bin/getcert"