From 2ebaf7ee9fd1aa7bb9f6cd4e0e12a2348ce4732d7b839604a14737b2143b9df9 Mon Sep 17 00:00:00 2001
From: Lubos Kocman <Lubos.Kocman@suse.com>
Date: Mon, 24 Jun 2024 13:46:57 +0200
Subject: [PATCH] don't use readonly root, further rename _multibuild

---
 Leap/Leap.kiwi   | 76 ++++++++++++++++++++++++------------------------
 Leap/_multibuild | 26 +++++++++++++++++
 2 files changed, 64 insertions(+), 38 deletions(-)
 create mode 100644 Leap/_multibuild

diff --git a/Leap/Leap.kiwi b/Leap/Leap.kiwi
index bc2791a..3132aab 100644
--- a/Leap/Leap.kiwi
+++ b/Leap/Leap.kiwi
@@ -6,13 +6,13 @@
     <description type="system">
         <author>openSUSE</author>
         <contact>crc@suse.com</contact>
-        <specification>openSUSE Leap Micro</specification>
+        <specification>Leap</specification>
     </description>
     <profiles>
         <!-- Profiles used as dependencies of actual image profiles -->
         <!-- Flavors -->
-        <profile name="full" description="openSUSE Leap Micro as KVM and Container host"/>
-        <profile name="container-host" description="openSUSE Leap Micro as Container host"/>
+        <profile name="full" description="Leap as KVM and Container host"/>
+        <profile name="container-host" description="Leap as Container host"/>
         <profile name="ecs_anywhere" description="Amazon ECS Anywhere support"/>
         <!-- Platforms - support profiles -->
         <profile name="bootloader" description="Bootloader files for x86_64 and aarch64"/>
@@ -64,123 +64,123 @@
             <requires profile="bootloader"/>
         </profile>
         <!-- Images (flavor + platform) -->
-        <profile name="Default" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot" arch="x86_64">
+        <profile name="Default" description="Leap with Podman and KVM as raw image with uEFI boot" arch="x86_64">
             <requires profile="full"/>
             <requires profile="x86"/>
         </profile>
-        <profile name="Base" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="x86_64">
+        <profile name="Base" description="Leap with Podman as raw image with uEFI boot" arch="x86_64">
             <requires profile="container-host"/>
             <requires profile="x86"/>
         </profile>
-        <profile name="Default-VMware" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot" arch="x86_64">
+        <profile name="Default-VMware" description="Leap with Podman and KVM as raw image with uEFI boot" arch="x86_64">
             <requires profile="full"/>
             <requires profile="x86-vmware"/>
         </profile>
-        <profile name="Base-VMware" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="x86_64">
+        <profile name="Base-VMware" description="Leap with Podman as raw image with uEFI boot" arch="x86_64">
             <requires profile="container-host"/>
 	    <requires profile="x86-vmware"/>
         </profile>
-        <profile name="Default-encrypted" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot" arch="x86_64">
+        <profile name="Default-encrypted" description="Leap with Podman and KVM as raw image with uEFI boot" arch="x86_64">
             <requires profile="full"/>
             <requires profile="x86-encrypted"/>
         </profile>
-        <profile name="Base-encrypted" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="x86_64">
+        <profile name="Base-encrypted" description="Leap with Podman as raw image with uEFI boot" arch="x86_64">
             <requires profile="container-host"/>
             <requires profile="x86-encrypted"/>
         </profile>
-        <profile name="Base-RT-encrypted" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="x86_64">
+        <profile name="Base-RT-encrypted" description="Leap with Podman as raw image with uEFI boot" arch="x86_64">
             <requires profile="container-host"/>
             <requires profile="x86-rt-encrypted"/>
         </profile>
-        <profile name="Default-SelfInstall" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot - SelfInstall" arch="x86_64">
+        <profile name="Default-SelfInstall" description="Leap with Podman and KVM as raw image with uEFI boot - SelfInstall" arch="x86_64">
             <requires profile="full"/>
             <requires profile="x86-self_install"/>
             <requires profile="self_install"/>
         </profile>
-        <profile name="Base-SelfInstall" description="openSUSE Leap Micro with Podman as raw image with uEFI boot - SelfInstall" arch="x86_64">
+        <profile name="Base-SelfInstall" description="Leap with Podman as raw image with uEFI boot - SelfInstall" arch="x86_64">
             <requires profile="container-host"/>
             <requires profile="x86-self_install"/>
             <requires profile="self_install"/>
         </profile>
-        <profile name="Default-SelfInstall" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot - SelfInstall" arch="aarch64">
+        <profile name="Default-SelfInstall" description="Leap with Podman and KVM as raw image with uEFI boot - SelfInstall" arch="aarch64">
             <requires profile="full"/>
             <requires profile="aarch64-self_install"/>
             <requires profile="self_install"/>
         </profile>
-        <profile name="Base-SelfInstall" description="openSUSE Leap Micro with Podman as raw image with uEFI boot - SelfInstall" arch="aarch64">
+        <profile name="Base-SelfInstall" description="Leap with Podman as raw image with uEFI boot - SelfInstall" arch="aarch64">
             <requires profile="container-host"/>
             <requires profile="aarch64-self_install"/>
             <requires profile="self_install"/>
         </profile>
-        <profile name="ECS-Anywhere" description="openSUSE Leap Micro with Podman and ECS Anywhere packagesas raw image with uEFI boot" arch="x86_64">
+        <profile name="ECS-Anywhere" description="Leap with Podman and ECS Anywhere packagesas raw image with uEFI boot" arch="x86_64">
             <requires profile="full"/>
             <requires profile="ecs_anywhere"/>
             <requires profile="x86"/>
         </profile>
-        <profile name="ECS-Anywhere-SelfInstall" description="openSUSE Leap Micro with Podman and ECS Anywhere packages as raw image with uEFI boot - SelfInstall" arch="x86_64">
+        <profile name="ECS-Anywhere-SelfInstall" description="Leap with Podman and ECS Anywhere packages as raw image with uEFI boot - SelfInstall" arch="x86_64">
             <requires profile="full"/>
             <requires profile="ecs_anywhere"/>
             <requires profile="x86-self_install"/>
             <requires profile="self_install"/>
         </profile>
-        <profile name="Default" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot" arch="aarch64">
+        <profile name="Default" description="Leap with Podman and KVM as raw image with uEFI boot" arch="aarch64">
             <requires profile="full"/>
             <requires profile="rpi"/>
         </profile>
-        <profile name="Base" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="aarch64">
+        <profile name="Base" description="Leap with Podman as raw image with uEFI boot" arch="aarch64">
             <requires profile="container-host"/>
             <requires profile="rpi"/>
         </profile>
-        <profile name="Base-RT" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="x86_64">
+        <profile name="Base-RT" description="Leap with Podman as raw image with uEFI boot" arch="x86_64">
             <requires profile="container-host"/>
             <requires profile="x86-rt"/>
         </profile>
-        <profile name="Base-RT-SelfInstall" description="openSUSE Leap Micro with Podman as raw image with uEFI boot - SelfInstall" arch="x86_64">
+        <profile name="Base-RT-SelfInstall" description="Leap with Podman as raw image with uEFI boot - SelfInstall" arch="x86_64">
             <requires profile="container-host"/>
             <requires profile="x86-rt-self_install"/>
             <requires profile="self_install"/>
         </profile>
-        <profile name="Default-qcow" description="openSUSE Leap Micro with Podman and KVM as raw image for KVM on System z" arch="s390x">
+        <profile name="Default-qcow" description="Leap with Podman and KVM as raw image for KVM on System z" arch="s390x">
             <requires profile="full"/>
             <requires profile="s390-kvm"/>
         </profile>
-        <profile name="Base-qcow" description="openSUSE Leap Micro with Podman as raw image for KVM on System z" arch="s390x">
+        <profile name="Base-qcow" description="Leap with Podman as raw image for KVM on System z" arch="s390x">
             <requires profile="container-host"/>
             <requires profile="s390-kvm"/>
         </profile>
-        <profile name="Default-dasd" description="openSUSE Leap Micro with Podman and KVM as raw image for KVM on System z" arch="s390x">
+        <profile name="Default-dasd" description="Leap with Podman and KVM as raw image for KVM on System z" arch="s390x">
             <requires profile="full"/>
             <requires profile="s390-dasd"/>
         </profile>
-        <profile name="Base-dasd" description="openSUSE Leap Micro with Podman as raw image for KVM on System z" arch="s390x">
+        <profile name="Base-dasd" description="Leap with Podman as raw image for KVM on System z" arch="s390x">
             <requires profile="container-host"/>
             <requires profile="s390-dasd"/>
         </profile>
-        <profile name="Default-fba" description="openSUSE Leap Micro with Podman and KVM as raw image for KVM on System z" arch="s390x">
+        <profile name="Default-fba" description="Leap with Podman and KVM as raw image for KVM on System z" arch="s390x">
             <requires profile="full"/>
             <requires profile="s390-fba"/>
         </profile>
-        <profile name="Base-fba" description="openSUSE Leap Micro with Podman as raw image for KVM on System z" arch="s390x">
+        <profile name="Base-fba" description="Leap with Podman as raw image for KVM on System z" arch="s390x">
             <requires profile="container-host"/>
             <requires profile="s390-fba"/>
         </profile>
-        <profile name="Default-legacy" description="openSUSE Leap Micro with Podman as raw image with legacy boot" arch="x86_64">
+        <profile name="Default-legacy" description="Leap with Podman as raw image with legacy boot" arch="x86_64">
             <requires profile="full"/>
             <requires profile="x86-legacy"/>
         </profile>
-        <profile name="Default-qcow" description="openSUSE Leap Micro with Podman and KVM as raw image with uEFI boot" arch="x86_64">
+        <profile name="Default-qcow" description="Leap with Podman and KVM as raw image with uEFI boot" arch="x86_64">
             <requires profile="full"/>
             <requires profile="x86-qcow"/>
         </profile>
-        <profile name="Base-qcow" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="x86_64">
+        <profile name="Base-qcow" description="Leap with Podman as raw image with uEFI boot" arch="x86_64">
             <requires profile="container-host"/>
             <requires profile="x86-qcow"/>
         </profile>
-	<profile name="Default-qcow" description="openSUSE Leap Micro with Podman and KMV as raw image with uEFI boot" arch="aarch64">
+	<profile name="Default-qcow" description="Leap with Podman and KMV as raw image with uEFI boot" arch="aarch64">
 	    <requires profile="full"/>
 	    <requires profile="aarch64-qcow"/>
         </profile>
-	<profile name="Base-qcow" description="openSUSE Leap Micro with Podman as raw image with uEFI boot" arch="aarch64">
+	<profile name="Base-qcow" description="Leap with Podman as raw image with uEFI boot" arch="aarch64">
 	    <requires profile="container-host"/>
 	    <requires profile="aarch64-qcow"/>
         </profile>
@@ -203,7 +203,7 @@
             bootkernel="custom"
             devicepersistency="by-uuid"
             btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
+            btrfs_root_is_readonly_snapshot="false"
             btrfs_quota_groups="true"
             luks_version="luks2"
             luks="1234"
@@ -246,7 +246,7 @@
             bootkernel="custom"
             devicepersistency="by-uuid"
             btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
+            btrfs_root_is_readonly_snapshot="false"
             btrfs_quota_groups="true"
         >
     	    <bootloader name="grub2" console="gfxterm" timeout="3"/>
@@ -285,7 +285,7 @@
             bootkernel="custom"
             devicepersistency="by-uuid"
             btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
+            btrfs_root_is_readonly_snapshot="false"
             btrfs_quota_groups="true"
         >
             <bootloader name="grub2" console="gfxterm" timeout="3" />
@@ -326,7 +326,7 @@
             btrfs_root_is_snapshot="true"
             efipartsize="128"
             editbootinstall="editbootinstall_rpi.sh"
-            btrfs_root_is_readonly_snapshot="true"
+            btrfs_root_is_readonly_snapshot="false"
             btrfs_quota_groups="false"
             disk_start_sector="4096"
         >
@@ -365,7 +365,7 @@
             bootkernel="custom"
             devicepersistency="by-uuid"
             btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
+            btrfs_root_is_readonly_snapshot="false"
             btrfs_quota_groups="true"
             disk_start_sector="4096"
         >
@@ -403,7 +403,7 @@
             kernelcmdline="hvc_iucv=8 TERM=dumb security=selinux selinux=1 quiet"
         devicepersistency="by-uuid"
             btrfs_root_is_snapshot="true"
-            btrfs_root_is_readonly_snapshot="true"
+            btrfs_root_is_readonly_snapshot="false"
             btrfs_quota_groups="true"
     >
             <bootloader name="grub2_s390x_emu" timeout="3" />
@@ -440,7 +440,7 @@
           devicepersistency="by-uuid"
           target_blocksize="4096"
           btrfs_root_is_snapshot="true"
-          btrfs_root_is_readonly_snapshot="true"
+          btrfs_root_is_readonly_snapshot="false"
           btrfs_quota_groups="true"
       >
             <bootloader name="grub2_s390x_emu" console="serial" timeout="3" targettype="CDL" />
diff --git a/Leap/_multibuild b/Leap/_multibuild
new file mode 100644
index 0000000..e716d7e
--- /dev/null
+++ b/Leap/_multibuild
@@ -0,0 +1,26 @@
+<multibuild>
+        <!-- for release -->
+        <flavor>Default</flavor>
+        <flavor>Base</flavor>
+        <!-- 
+        <flavor>Default-VMware</flavor>
+        <flavor>Base-VMware</flavor>
+        <flavor>Default-encrypted</flavor>
+        <flavor>Base-encrypted</flavor>
+        <flavor>Default-SelfInstall</flavor>
+        <flavor>Base-SelfInstall</flavor>
+        <flavor>Default-qcow</flavor>
+        <flavor>Base-qcow</flavor>
+        <flavor>Base-RT-SelfInstall</flavor>
+        <flavor>Base-RT</flavor>
+        <flavor>Base-RT-encrypted</flavor>
+        <flavor>Base-dasd</flavor>
+        <flavor>Base-fba</flavor>
+        <flavor>Default-dasd</flavor>
+        <flavor>Default-fba</flavor> -->
+        <!-- for testing purposes only -->
+<!--
+        <flavor>image-legacy</flavor>
+-->
+</multibuild>
+