From e34d76f7eb09b4789619dab5aa2f51e3fa80d876 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 22 Jun 2021 12:19:54 -0400
Subject: [PATCH] OpenSUSE 15.3 support

A number of changes in opensuse 15.3 require modifying our
strategy.

No more XInclude. This seems to be unintentional, but it released
and so we will work around it.

Some somewhat incorrect values, as pointed out by new validation.
---
 .../suse15/profiles/hpc/autoyast              | 33 +++++++++----------
 .../suse15/profiles/hpc/initprofile.sh        |  2 +-
 .../suse15/profiles/hpc/scripts/pre.sh        | 12 ++++++-
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/confluent_osdeploy/suse15/profiles/hpc/autoyast b/confluent_osdeploy/suse15/profiles/hpc/autoyast
index 7aec831c..8f7566e8 100644
--- a/confluent_osdeploy/suse15/profiles/hpc/autoyast
+++ b/confluent_osdeploy/suse15/profiles/hpc/autoyast
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
-<!DOCTYPE profile SYSTEM "/usr/share/YaST2/include/autoinstall/profile.dtd">
+<!DOCTYPE profile>
 <!--
 This autoyast file will be processed by pre.sh before applying. See pre.sh for
 info on modifying its behavior, and also search and replace '%%' to remove
 dynamic behavior and replace with static configuration.
 --> 
-<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns" xmlns:xi="http://www.w3.org/2001/XInclude">
+<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
+    <timezone>
+      <hwclock>UTC</hwclock>
+      <!--INSERT:/tmp/timezone-->
+    </timezone>
     <general>
       <self_update config:type="boolean">false</self_update>
-      <clock>
-        <hwclock>UTC</hwclock>
-        <xi:include href="file:///tmp/timezone"/>
-      </clock>
       <mode>
 	      <confirm config:type="boolean">false</confirm>
       </mode>
@@ -19,16 +19,16 @@ dynamic behavior and replace with static configuration.
     %%IFSLE%%
     <add-on>
         <add_on_products config:type="list">
-            <listentry><xi:include href="file:///tmp/pkgurl"/><product>sle-module-basesystem</product><product_dir>/Module-Basesystem</product_dir></listentry>
-	    <listentry><xi:include href="file:///tmp/pkgurl"/><product>sle-module-hpc</product><product_dir>/Module-HPC</product_dir></listentry>
-	    <listentry><xi:include href="file:///tmp/pkgurl"/><product>sle-module-server-applications</product><product_dir>/Module-Server-Applications</product_dir></listentry>
-	    <listentry><xi:include href="file:///tmp/pkgurl"/><product>sle-module-containers</product><product_dir>/Module-Containers</product_dir></listentry>
-	    <listentry><xi:include href="file:///tmp/pkgurl"/><product>SLE_HPC</product><product_dir>/Product-HPC</product_dir></listentry>
-	    <listentry><xi:include href="file:///tmp/pkgurl"/><product>Legacy-Module</product><product_dir>/Module-Legacy</product_dir></listentry>
+            <listentry><!--INSERT:/tmp/pkgurl--><product>sle-module-basesystem</product><product_dir>/Module-Basesystem</product_dir></listentry>
+	    <listentry><!--INSERT:/tmp/pkgurl--><product>sle-module-hpc</product><product_dir>/Module-HPC</product_dir></listentry>
+	    <listentry><!--INSERT:/tmp/pkgurl--><product>sle-module-server-applications</product><product_dir>/Module-Server-Applications</product_dir></listentry>
+	    <listentry><!--INSERT:/tmp/pkgurl--><product>sle-module-containers</product><product_dir>/Module-Containers</product_dir></listentry>
+	    <listentry><!--INSERT:/tmp/pkgurl--><product>SLE_HPC</product><product_dir>/Product-HPC</product_dir></listentry>
+	    <listentry><!--INSERT:/tmp/pkgurl--><product>Legacy-Module</product><product_dir>/Module-Legacy</product_dir></listentry>
         </add_on_products>
 </add-on>
     %%ENDIFSLE%%
-    <xi:include href="file:///tmp/bootloader.xml"/>
+    <!--INSERT:/tmp/bootloader.xml-->
     <software>
        %%IFSLE%%
        <products config:type="list">
@@ -39,6 +39,7 @@ dynamic behavior and replace with static configuration.
         <pattern>base</pattern>
       </patterns>
       <packages config:type="list">
+	<package>openssh</package>
         <package>python3</package>
         <package>openssl</package>
         <package>chrony</package>
@@ -79,7 +80,7 @@ dynamic behavior and replace with static configuration.
         <username>root</username>
         <user_password>%%ROOTPASSWORD%%</user_password>
         <encrypted config:type="boolean">true</encrypted>
-	<xi:include href="file:///tmp/rootkeys.xml"/>
+	<!--INSERT:/tmp/rootkeys.xml-->
       </user>
     </users>
     <networking>
@@ -99,7 +100,6 @@ dynamic behavior and replace with static configuration.
          <pre-scripts config:type="list">
         <script>
           <filename>preinstall.sh</filename>
-          <interpreter>shell</interpreter>
           <source>
 <![CDATA[
 #!/bin/sh
@@ -115,7 +115,6 @@ curl $proto://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/pre.
          <chroot-scripts config:type="list">
         <script>
           <filename>chroot.sh</filename>
-          <interpreter>shell</interpreter>
           <source>
 <![CDATA[
 #!/bin/sh
@@ -135,14 +134,12 @@ cp /mnt/etc/confluent/post.sh /mnt/var/adm/autoinstall/scripts/
         <script>
           <chrooted config:type="boolean">true</chrooted>
           <filename>post.sh</filename>
-          <interpreter>shell</interpreter>
           <location>file:///etc/confluent/post.sh</location>
         </script>
       </chroot-scripts>
       <init-scripts config:type="list">
         <script>
           <filename>firstboot.sh</filename>
-          <interpreter>shell</interpreter>
           <location>file:///etc/confluent/firstboot.sh</location>
         </script>
      </init-scripts> 
diff --git a/confluent_osdeploy/suse15/profiles/hpc/initprofile.sh b/confluent_osdeploy/suse15/profiles/hpc/initprofile.sh
index 5169c88c..5d5f4c2b 100644
--- a/confluent_osdeploy/suse15/profiles/hpc/initprofile.sh
+++ b/confluent_osdeploy/suse15/profiles/hpc/initprofile.sh
@@ -16,5 +16,5 @@ profile=$(basename $2)
 if [[ $profile =~ ^sle.* ]]; then
 	sed -i 's/%%IFSLE%%//;s/%%ENDIFSLE%%//' $2/autoyast
 else
-	sed -i 's/%%IFSLE%%/<!--/;s/%%ENDIFSLE%%/-->/' $2/autoyast
+	sed -i '/%%IFSLE%%/<!--/,/%%ENDIFSLE%%/d' $2/autoyast
 fi
diff --git a/confluent_osdeploy/suse15/profiles/hpc/scripts/pre.sh b/confluent_osdeploy/suse15/profiles/hpc/scripts/pre.sh
index b5764fb9..a7f3ce02 100644
--- a/confluent_osdeploy/suse15/profiles/hpc/scripts/pre.sh
+++ b/confluent_osdeploy/suse15/profiles/hpc/scripts/pre.sh
@@ -38,4 +38,14 @@ if grep ^ntpservers: /etc/confluent/confluent.deploycfg > /dev/null; then
     ntpcfg=$(paste -sd '' /tmp/ntp.cfg)
 fi
 run_remote_python getinstalldisk
-sed -e s!%%INSTDISK%%!/dev/$(cat /tmp/installdisk)! -e s!%%NODENAME%%!$nodename! -e "s!<networking>!$ntpcfg<networking>!" -e "s?%%ROOTPASSWORD%%?${rootpw}?" /tmp/profile/autoinst.xml > /tmp/profile/modified.xml
+sed -e s'!'%%INSTDISK%%'!'/dev/$(cat /tmp/installdisk)'!' -e s'!'%%NODENAME%%'!'$nodename'!' -e s'!<networking>!'$ntpcfg'<networking>!' -e "s?%%ROOTPASSWORD%%?${rootpw}?" /tmp/profile/autoinst.xml > /tmp/profile/modified.xml
+#This would be nice, but suse discards comments before it makes it to /tmp/profile
+#for file in $(grep '<!--INSERT' /tmp/profile/modified.xml |sed -e s/.*INSERT:// -e 's/-->//'); do
+#    sed -i 's%<!--INSERT:'${file}'-->'"%$(cat $file|tr -d '\n')"% /tmp/profile/modified.xml
+#done
+if grep append /tmp/bootloader.xml > /dev/null; then
+    sed -i 's@</general>@</general>'"$(tr -d '\n' < /tmp/bootloader.xml)"'@' /tmp/profile/modified.xml
+fi
+sed -i 's#root</username>#root</username>'"$(tr -d '\n' < /tmp/rootkeys.xml)"'#' /tmp/profile/modified.xml
+sed -i 's@/hwclock>@/hwclock>'"$(tr -d '\n' < /tmp/timezone)"'@' /tmp/profile/modified.xml
+sed -i 's@<product_dir>@'"$(tr -d '\n' < /tmp/pkgurl)"'<product_dir>@' /tmp/profile/modified.xml