From c5c5ee3023d41830c2dca92ddd4b21dbb3adde9b Mon Sep 17 00:00:00 2001
From: cxhong <abcdqiu@gmail.com>
Date: Tue, 19 Nov 2019 15:48:09 -0500
Subject: [PATCH] Support SLE15 diskfull installation

---
 .../share/xcat/install/scripts/post.sle       | 21 +++++++++++++++++++
 .../install/scripts/{pre.sle15 => pre.sle}    |  0
 .../share/xcat/install/sle/compute.pkglist    |  1 +
 .../{sles => sle}/compute.sle15.pkglist       |  0
 .../install/{sles => sle}/compute.sle15.tmpl  |  4 ++--
 .../share/xcat/install/sle/compute.tmpl       |  1 +
 6 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 xCAT-server/share/xcat/install/scripts/post.sle
 rename xCAT-server/share/xcat/install/scripts/{pre.sle15 => pre.sle} (100%)
 create mode 120000 xCAT-server/share/xcat/install/sle/compute.pkglist
 rename xCAT-server/share/xcat/install/{sles => sle}/compute.sle15.pkglist (100%)
 rename xCAT-server/share/xcat/install/{sles => sle}/compute.sle15.tmpl (96%)
 create mode 120000 xCAT-server/share/xcat/install/sle/compute.tmpl

diff --git a/xCAT-server/share/xcat/install/scripts/post.sle b/xCAT-server/share/xcat/install/scripts/post.sle
new file mode 100644
index 000000000..2eba0eae3
--- /dev/null
+++ b/xCAT-server/share/xcat/install/scripts/post.sle
@@ -0,0 +1,21 @@
+      <post-scripts config:type="list">
+        <script>
+          <filename>xcat.sh</filename>
+          <interpreter>shell</interpreter>
+          <debug config:type="boolean">false</debug>
+          <source>
+
+<![CDATA[
+mkdir -p /var/log/xcat/
+{
+echo "Running AutoYaST Post-Installation script..."
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.sles.common#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat#
+} >>/var/log/xcat/xcat.log 2>&1
+
+]]>
+
+          </source>
+        </script>
+      </post-scripts>
+
diff --git a/xCAT-server/share/xcat/install/scripts/pre.sle15 b/xCAT-server/share/xcat/install/scripts/pre.sle
similarity index 100%
rename from xCAT-server/share/xcat/install/scripts/pre.sle15
rename to xCAT-server/share/xcat/install/scripts/pre.sle
diff --git a/xCAT-server/share/xcat/install/sle/compute.pkglist b/xCAT-server/share/xcat/install/sle/compute.pkglist
new file mode 120000
index 000000000..0e114f64f
--- /dev/null
+++ b/xCAT-server/share/xcat/install/sle/compute.pkglist
@@ -0,0 +1 @@
+compute.sle15.pkglist
\ No newline at end of file
diff --git a/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist b/xCAT-server/share/xcat/install/sle/compute.sle15.pkglist
similarity index 100%
rename from xCAT-server/share/xcat/install/sles/compute.sle15.pkglist
rename to xCAT-server/share/xcat/install/sle/compute.sle15.pkglist
diff --git a/xCAT-server/share/xcat/install/sles/compute.sle15.tmpl b/xCAT-server/share/xcat/install/sle/compute.sle15.tmpl
similarity index 96%
rename from xCAT-server/share/xcat/install/sles/compute.sle15.tmpl
rename to xCAT-server/share/xcat/install/sle/compute.sle15.tmpl
index d2ff50e93..b5254111d 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sle15.tmpl
+++ b/xCAT-server/share/xcat/install/sle/compute.sle15.tmpl
@@ -90,9 +90,9 @@
       </routing>
     </networking>
     <scripts>
-   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.sle15#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.sle#
    #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/chroot.sles#
-   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.sles11#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.sle#
     </scripts>
   </configure>
 </profile>
diff --git a/xCAT-server/share/xcat/install/sle/compute.tmpl b/xCAT-server/share/xcat/install/sle/compute.tmpl
new file mode 120000
index 000000000..357788ec3
--- /dev/null
+++ b/xCAT-server/share/xcat/install/sle/compute.tmpl
@@ -0,0 +1 @@
+compute.sle15.tmpl
\ No newline at end of file