Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openSUSE-MicroOS for openSUSE:Factory checked in at 2024-07-24 15:29:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-MicroOS (Old) and /work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.1869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-MicroOS" Wed Jul 24 15:29:39 2024 rev:77 rq:1189251 version:16.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-MicroOS/openSUSE-MicroOS.changes 2024-07-03 20:29:39.843667917 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.1869/openSUSE-MicroOS.changes 2024-07-25 11:59:17.322742948 +0200 @@ -1,0 +2,12 @@ +Tue Jul 16 08:13:01 UTC 2024 - Alberto Planas Dominguez <aplanas@suse.com> + +- Add /etc/sysconfig/bootloader LOADER_TYPE for grub2-bls and sd-boot + +------------------------------------------------------------------- +Tue Jul 2 10:39:18 UTC 2024 - Alberto Planas Dominguez <aplanas@suse.com> + +- Add grub2 FDE image +- Remove custom bootloader for the grub2 image, and use bls="true" +- Remove sdbootutil-scriptlets + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-MicroOS.kiwi ++++++ --- /var/tmp/diff_new_pack.lzIkqZ/_old 2024-07-25 11:59:18.438793524 +0200 +++ /var/tmp/diff_new_pack.lzIkqZ/_new 2024-07-25 11:59:18.442793705 +0200 @@ -12,6 +12,7 @@ <profile name="ContainerHost" description="MicroOS with container runtime (podman)"/> <!-- Platforms --> <profile name="kvm-and-xen-sdboot" description="kvm-and-xen with systemd-boot" arch="x86_64,aarch64"/> + <profile name="kvm-and-xen-grub" description="kvm-and-xen with GRUB2 and bootctl" arch="x86_64,aarch64"/> <profile name="kvm-and-xen" description="kvm-and-xen" arch="x86_64,aarch64,armv7l"/> <profile name="VMware" description="VMware for x86_64" arch="x86_64"/> <profile name="MS-HyperV" description="Hyper-V" arch="x86_64,aarch64"/> @@ -94,6 +95,38 @@ <size unit="G">20</size> </type> </preferences> + <preferences profiles="kvm-and-xen-grub"> + <version>16.0.0</version> + <packagemanager>zypper</packagemanager> + <rpm-excludedocs>true</rpm-excludedocs> + <locale>en_US</locale> + <type + image="oem" + filesystem="btrfs" + format="qcow2" + firmware="uefi" + bootpartition="false" + initrd_system="none" + efipartsize="500" + bootkernel="custom" + editbootinstall="editbootinstall_mbr.sh" + devicepersistency="by-uuid" + btrfs_root_is_snapshot="true" + btrfs_root_is_readonly_snapshot="true" + btrfs_quota_groups="true" + > + <bootloader name="grub2" bls="true" /> + <systemdisk> + <volume name="home"/> + <volume name="root"/> + <volume name="opt"/> + <volume name="srv"/> + <volume name="usr/local"/> + <volume name="var" copy_on_write="false"/> + </systemdisk> + <size unit="G">20</size> + </type> + </preferences> <preferences profiles="kvm-and-xen" arch="x86_64"> <version>16.0.0</version> <packagemanager>zypper</packagemanager> @@ -692,14 +725,13 @@ <package name="growpart-generator"/> <package name="patterns-base-bootloader"/> </packages> - <packages type="image" profiles="kvm-and-xen-sdboot"> + <packages type="image" profiles="kvm-and-xen-sdboot,kvm-and-xen-grub"> <!-- Needed for initial configuration, except on OpenStack-Cloud, where cloud-init is used --> <package name="ignition-dracut"/> <package name="combustion >= 1.2"/> <!-- New firstboot mechanism --> <package name="jeos-firstboot"/> <package name="growpart-generator"/> <package name="sdbootutil-snapper"/> - <package name="sdbootutil-rpm-scriptlets"/> <package name="disk-encryption-tool"/> <package name="dracut-pcr-signature"/> <package name="systemd-experimental"/> @@ -707,6 +739,12 @@ <package name="efibootmgr"/> <package name="uefi_mbr" arch="x86_64"/> </packages> + <packages type="image" profiles="kvm-and-xen-grub"> + <package name="patterns-base-bootloader"/> + <package name="uefi_mbr" arch="x86_64"/> + <package name="grub2-x86_64-efi" arch="x86_64"/> + <package name="grub2-arm-efi" arch="aarch64"/> + </packages> <packages type="image" profiles="Pine64,RaspberryPi,RaspberryPi2,Rock64"> <package name="patterns-microos-hardware"/> </packages> ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.lzIkqZ/_old 2024-07-25 11:59:18.490795881 +0200 +++ /var/tmp/diff_new_pack.lzIkqZ/_new 2024-07-25 11:59:18.494796062 +0200 @@ -29,5 +29,6 @@ <flavor>ContainerHost-SelfInstall</flavor> <flavor>DigitalOcean-Cloud</flavor> <flavor>kvm-and-xen-sdboot</flavor> + <flavor>kvm-and-xen-grub</flavor> </multibuild> ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.lzIkqZ/_old 2024-07-25 11:59:18.510796787 +0200 +++ /var/tmp/diff_new_pack.lzIkqZ/_new 2024-07-25 11:59:18.514796968 +0200 @@ -258,16 +258,20 @@ #-------------------------------------- # [[ "$kiwi_profiles" == *"kvm-and-xen-"* ]] if rpm -q sdbootutil; then - for d in /usr/lib/modules/*; do - test -d "$d" || continue - depmod -a "${d##*/}" - done - ENTRY_TOKEN=$(. /usr/lib/os-release; echo $ID) - mkdir -p /etc/kernel - echo "$ENTRY_TOKEN" > /etc/kernel/entry-token - # FIXME: kiwi needs /boot/efi to exist before syncing the disk image - mkdir -p /boot/efi + for d in /usr/lib/modules/*; do + test -d "$d" || continue + depmod -a "${d##*/}" + done + ENTRY_TOKEN=$(. /usr/lib/os-release; echo $ID) + mkdir -p /etc/kernel + echo "$ENTRY_TOKEN" > /etc/kernel/entry-token + # FIXME: kiwi needs /boot/efi to exist before syncing the disk image + mkdir -p /boot/efi - echo "${cmdline[*]}" > /etc/kernel/cmdline + echo "${cmdline[*]}" > /etc/kernel/cmdline + + rpm -q systemd-boot && loader_type="systemd-boot" + rpm -q grub2 && loader_type="grub2-bls" + echo "LOADER_TYPE" >> /etc/sysconfig/bootloader fi