Test of autoyast_containers_xml for s390x SLE15-SP5 ONLY

xml file removed '#' and comments and blank lines skip loader params.
m-dati · Dec 5, 2023 · dad42e8 · dad42e8
1 parent 079cbb5
commit dad42e8
Showing 1 changed file with 4 additions and 19 deletions.
diff --git a/data/containers/autoyast_containers.xml.ep b/data/containers/autoyast_containers.xml.ep
@@ -38,42 +38,36 @@
       <confirm config:type="boolean">false</confirm>
     </mode>
     % if ($check_var->('ARCH', 's390x')) {
-    <ask-list config:type="list"/>
     <cio_ignore config:type="boolean">false</cio_ignore>
     <final_reboot config:type="boolean">true</final_reboot>
     % }
   </general>
   <bootloader>
-    % if ($check_var->('ARCH', 'ppc64le') or $check_var->('ARCH', 's390x')) {
+    % if ($check_var->('ARCH', 'ppc64le') or $check_var->('ARCH', 's390x-SKIPTHIS')) {
     <loader_type>grub2</loader_type>
     % }
     <global>
-      % if ($check_var->('ARCH', 's390x')) {
+      % if ($check_var->('ARCH', 's390x-SKIPTHIS')) {
       <activate>false</activate>
       <boot_extended>false</boot_extended>
       <boot_mbr>true</boot_mbr>
       <boot_root>true</boot_root>
       <generic_mbr>false</generic_mbr>
-      # added for s390x:
       <append>hvc_iucv=8 TERM=dumb resume=/dev/disk/by-path/ccw-0.0.0000-part3 crashkernel=163M</append>
       <gfxmode>auto</gfxmode>
       <hiddenmenu>false</hiddenmenu>
       <os_prober>false</os_prober>
       <terminal>console</terminal>
       <timeout config:type="integer">8</timeout>
-      # <trusted_grub>false</trusted_grub> # wrong tag
       <trusted_boot>true</trusted_boot>
       <xen_append>crashkernel=163M</xen_append>
-      #<xen_kernel_append>crashkernel=163M\&lt;4G</xen_kernel_append>
-      <xen_kernel_append>crashkernel=163M</xen_kernel_append> # Crash offset default used
-      #
+      <xen_kernel_append>crashkernel=163M</xen_kernel_append>
       % } elsif ($check_var->('ARCH', 'ppc64le')) {
       <append>showopts plymouth.ignore-serial-consoles console=hvc0 console=tty mitigations=auto crashkernel=201M</append>
       <boot_boot>false</boot_boot>
       % } else {
       <append>splash=verbose</append>
       % }
-      <timeout config:type="integer">-1</timeout>
     </global>
     % unless ($check_var->('ARCH', 's390x')) {
     <device_map config:type="list">
@@ -86,6 +80,7 @@
   </bootloader>
   <networking>
     % if ($check_var->('ARCH', 's390x')) {
+    <keep_install_network config:type="boolean">false</keep_install_network>
     <interfaces config:type="list">
       <interface>
         <bootproto>dhcp</bootproto>
@@ -118,22 +113,14 @@
     </zones>
   </firewall>
   % }
-
   % if ($check_var->('ARCH', 's390x')) {
-  <dasd>
-    <devices config:type="list"/>
-    # <format_unformatted config:type="boolean">false</format_unformatted> # unknown tag
-  </dasd>
   <deploy_image>
     <image_installation config:type="boolean">false</image_installation>
   </deploy_image>
   % }
-
-  # partitioning
   % if ($check_var->('ARCH', 's390x')) {
   <partitioning config:type="list">
     <drive>
-      <_id config:type="integer">0</_id>
       <device>/dev/disk/by-path/ccw-0.0.0000</device>
       <disklabel>gpt</disklabel>
       <enable_snapshots config:type="boolean">true</enable_snapshots>
@@ -232,7 +219,6 @@
     </drive>
   </partitioning>
   % }
-
   <software>
     <products config:type="list">
       <product>SLES</product>
@@ -250,7 +236,6 @@
       % unless ($get_var->('VERSION') =~ /12-SP3|12-SP4|12-SP5|15$/) {
       <package>podman</package>
       % }}
-
       % if ($get_var->('VERSION') =~ /15$|15-SP1|15-SP2/) {
       <package>podman-cni-config</package>
       % }