From 844fa6bff82a2e479c196e272c446ed6f1a2abab Mon Sep 17 00:00:00 2001
From: AJ Schroeder <6432150+ajschroeder@users.noreply.github.com>
Date: Mon, 1 Jul 2024 16:36:14 -0500
Subject: [PATCH] removed repo and templated network config

---
 .../leap-15-5/data/autoinst.pkrtpl.hcl        | 37 +-------------
 .../leap-15-5/data/network.pkrtpl.hcl         | 50 +++++++++++++++++++
 2 files changed, 52 insertions(+), 35 deletions(-)
 create mode 100644 builds/linux/opensuse/leap-15-5/data/network.pkrtpl.hcl

diff --git a/builds/linux/opensuse/leap-15-5/data/autoinst.pkrtpl.hcl b/builds/linux/opensuse/leap-15-5/data/autoinst.pkrtpl.hcl
index fa5c491..6f08fab 100644
--- a/builds/linux/opensuse/leap-15-5/data/autoinst.pkrtpl.hcl
+++ b/builds/linux/opensuse/leap-15-5/data/autoinst.pkrtpl.hcl
@@ -17,13 +17,6 @@
         <priority t="integer">99</priority>
         <product_dir>/</product_dir>
       </listentry>
-      <listentry t="map">
-        <alias>repo-openh264</alias>
-        <media_url>http://codecs.opensuse.org/openh264/openSUSE_Leap/</media_url>
-        <name>Open H.264 Codec (openSUSE Leap)</name>
-        <priority t="integer">99</priority>
-        <product_dir/>
-      </listentry>
       <listentry t="map">
         <alias>repo-sle-update</alias>
         <media_url>http://download.opensuse.org/update/leap/15.5/sle/</media_url>
@@ -54,14 +47,13 @@
       <gfxmode>auto</gfxmode>
       <hiddenmenu>false</hiddenmenu>
       <os_prober>true</os_prober>
-      <secure_boot>true</secure_boot>
+      <secure_boot>false</secure_boot>
       <terminal>gfxterm</terminal>
       <timeout t="integer">8</timeout>
       <trusted_grub>false</trusted_grub>
       <update_nvram>true</update_nvram>
       <xen_kernel_append>vga=gfx-1024x768x16</xen_kernel_append>
     </global>
-    <loader_type>grub2</loader_type>
   </bootloader>
   <kdump>
     <add_crash_kernel config:type="boolean">false</add_crash_kernel>
@@ -451,32 +443,7 @@
       </hosts_entry>
     </hosts>
   </host>
-  <networking t="map">
-    <dhcp_options t="map">
-      <dhclient_client_id/>
-      <dhclient_hostname_option>AUTO</dhclient_hostname_option>
-    </dhcp_options>
-    <dns t="map">
-      <dhcp_hostname t="boolean">true</dhcp_hostname>
-      <hostname>localhost</hostname>
-      <resolv_conf_policy>auto</resolv_conf_policy>
-    </dns>
-    <interfaces t="list">
-      <interface t="map">
-        <bootproto>dhcp</bootproto>
-        <name>eth0</name>
-        <startmode>auto</startmode>
-        <zone>public</zone>
-      </interface>
-    </interfaces>
-    <ipv6 t="boolean">true</ipv6>
-    <keep_install_network t="boolean">true</keep_install_network>
-    <managed t="boolean">false</managed>
-    <routing t="map">
-      <ipv4_forward t="boolean">false</ipv4_forward>
-      <ipv6_forward t="boolean">false</ipv6_forward>
-    </routing>
-  </networking>
+${network}
   <ntp-client t="map">
     <ntp_policy>auto</ntp_policy>
     <ntp_servers t="list"/>
diff --git a/builds/linux/opensuse/leap-15-5/data/network.pkrtpl.hcl b/builds/linux/opensuse/leap-15-5/data/network.pkrtpl.hcl
new file mode 100644
index 0000000..5aac10a
--- /dev/null
+++ b/builds/linux/opensuse/leap-15-5/data/network.pkrtpl.hcl
@@ -0,0 +1,50 @@
+  <networking t="map">
+    <dhcp_options t="map">
+      <dhclient_client_id/>
+      <dhclient_hostname_option>AUTO</dhclient_hostname_option>
+    </dhcp_options>
+    <dns t="map">
+%{ if ip != null ~}
+      <nameservers config:type="list">
+%{ for dns_server in dns ~}
+        <nameserver>${dns_server}</nameserver>
+%{ endfor ~}
+      </nameservers>
+%{ else ~}
+      <dhcp_hostname t="boolean">true</dhcp_hostname>
+      <hostname>localhost</hostname>
+%{ endif ~}
+      <resolv_conf_policy>auto</resolv_conf_policy>
+    </dns>
+    <interfaces t="list">
+      <interface t="map">
+%{ if ip != null ~}
+        <bootproto>static</bootproto>
+        <ipaddr>${ip}</ipaddr>
+        <prefixlen>${netmask}</prefixlen>
+%{ else ~}
+        <bootproto>dhcp</bootproto>
+%{ endif ~}
+        <name>eth0</name>
+        <startmode>auto</startmode>
+        <zone>public</zone>
+      </interface>
+    </interfaces>
+    <ipv6 t="boolean">true</ipv6>
+    <keep_install_network t="boolean">true</keep_install_network>
+    <managed t="boolean">false</managed>
+    <routing t="map">
+      <ipv4_forward t="boolean">false</ipv4_forward>
+      <ipv6_forward t="boolean">false</ipv6_forward>
+%{ if ip != null ~}
+      <routes t="list">
+        <route t="map">
+          <destination>default</destination>
+          <device>-</device>
+          <gateway>${gateway}</gateway>
+          <netmask>-</netmask>
+        </route>
+      </routes>
+%{ endif ~}
+    </routing>
+  </networking>
\ No newline at end of file