commit openSUSE-MicroOS for openSUSE:Factory

[Source-Sync]

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-10-06 17:51:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-MicroOS (Old)
 and      /work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openSUSE-MicroOS"

Sun Oct  6 17:51:37 2024 rev:81 rq:1205711 version:16.0.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/openSUSE-MicroOS/openSUSE-MicroOS.changes        
2024-10-02 21:33:24.190428172 +0200
+++ 
/work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.19354/openSUSE-MicroOS.changes 
    2024-10-06 17:51:45.784584038 +0200
@@ -1,0 +2,6 @@
+Thu Oct  3 09:42:47 UTC 2024 - Alberto Planas Dominguez <apla...@suse.com>
+
+- Move /etc/sysconfig/bootloader creation to disk.sh, as KIWI can
+  replace the one generated in config.sh (bsc#1231271)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.UwWv19/_old  2024-10-06 17:51:46.348607476 +0200
+++ /var/tmp/diff_new_pack.UwWv19/_new  2024-10-06 17:51:46.352607643 +0200
@@ -273,10 +273,6 @@
 
        echo "${cmdline[*]}" > /etc/kernel/cmdline
 
-       rpm -q systemd-boot && loader_type="systemd-boot"
-       rpm -q grub2 && loader_type="grub2-bls"
-       echo "LOADER_TYPE=\"${loader_type}\"" >> /etc/sysconfig/bootloader
-
        [ -e /var/lib/YaST2/reconfig_system ] && systemctl enable 
disk-encryption-tool-enroll.service
 fi
 

++++++ disk.sh ++++++
--- /var/tmp/diff_new_pack.UwWv19/_old  2024-10-06 17:51:46.372608474 +0200
+++ /var/tmp/diff_new_pack.UwWv19/_new  2024-10-06 17:51:46.372608474 +0200
@@ -14,7 +14,15 @@
     esac
 
     echo "install boot loader"
+    loader_type="grub2-bls"
+    rpm -q systemd-boot && loader_type="systemd-boot"
+    if [ -f /etc/sysconfig/bootloader ]; then
+       sed -i "s/^LOADER_TYPE=.*$/LOADER_TYPE=\"$loader_type\"/g" 
/etc/sysconfig/bootloader
+    else
+       echo "LOADER_TYPE=\"${loader_type}\"" > /etc/sysconfig/bootloader
+    fi
     sdbootutil -v --no-random-seed --arch "$arch" --esp-path /boot/efi 
--entry-token=auto --no-variables install
+
     echo "add kernels"
     export hostonly_l=no # for dracut
     sdbootutil -v --arch "$arch" --esp-path /boot/efi --entry-token=auto 
add-all-kernels