From b544840a8ba1817a5d4989dc52b9bbd02dbf4e75 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Sat, 11 Aug 2018 13:17:44 -0400
Subject: [PATCH] Move xcatpostinit to /opt/xcat

systemd was confused by the /etc/init.d entry it shouldn't use
---
 xCAT-server/share/xcat/netboot/sle/genimage | 5 +++--
 xCAT/postscripts/xcatpostinit.service       | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/sle/genimage b/xCAT-server/share/xcat/netboot/sle/genimage
index baf3746f6..7f9f3f05f 100755
--- a/xCAT-server/share/xcat/netboot/sle/genimage
+++ b/xCAT-server/share/xcat/netboot/sle/genimage
@@ -2058,8 +2058,9 @@ sub generic_post { # This function is meant to leave the image in a state approx
         chmod(0755, "$rootimg_dir/etc/init.d/gettyset");
     }
 
-    copy("$installroot/postscripts/xcatpostinit", "$rootimg_dir/etc/init.d/xcatpostinit");
-    chmod(0755, "$rootimg_dir/etc/init.d/xcatpostinit");
+    system("mkdir -p $rootimg_dir/opt/xcat");
+    copy("$installroot/postscripts/xcatpostinit", "$rootimg_dir/opt/xcat/xcatpostinit");
+    chmod(0755, "$rootimg_dir/opt/xcat/xcatpostinit");
     copy("$installroot/postscripts/xcatpostinit.service", "$rootimg_dir/usr/lib/systemd/system/xcatpostinit.service");
 
     #
diff --git a/xCAT/postscripts/xcatpostinit.service b/xCAT/postscripts/xcatpostinit.service
index e7e564360..4f1f57e4d 100755
--- a/xCAT/postscripts/xcatpostinit.service
+++ b/xCAT/postscripts/xcatpostinit.service
@@ -4,8 +4,8 @@ After=network.target rsyslog.service
 
 [Service]
 Type=oneshot
-ExecStart=/etc/init.d/xcatpostinit start
-ExecStop=/etc/init.d/xcatpostinit stop
+ExecStart=/opt/xcat/xcatpostinit start
+ExecStop=/opt/xcat/xcatpostinit stop
 RemainAfterExit=yes
 
 [Install]