Merge pull request 'a couple s390x adjustments' (#1) from fix/s390x into r9

Reviewed-on: #1

cloud/cloud.xml

@@ -115,7 +115,7 @@
       <oemconfig>
         <oem-resize>false</oem-resize>
       </oemconfig>
-      <bootloader name="grub2" timeout="1"/>
+      <bootloader name="zipl" targettype="CDL" timeout="1"/>
       <size unit="M">10738</size>
       <systemdisk name="rocky" preferlvm="true">
         <volume name="@root" size="9G" mountpoint="/" />
@@ -224,7 +224,7 @@
     <package name="dracut-config-generic"/>
     <package name="firewalld"/>
     <package name="gdisk"/>
-    <package name="grub2"/>
+    <package name="grub2" arch="x86_64,aarch64,ppc64le"/>
     <package name="kernel"/>
     <package name="nfs-utils"/>
     <package name="rsync"/>