Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kiwi-templates-Minimal for
openSUSE:Factory checked in at 2024-10-06 17:51:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-templates-Minimal (Old)
and /work/SRC/openSUSE:Factory/.kiwi-templates-Minimal.new.19354 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-templates-Minimal"
Sun Oct 6 17:51:38 2024 rev:22 rq:1205713 version:84.87.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-templates-Minimal/kiwi-templates-Minimal.changes
2024-10-02 21:33:26.962543418 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-templates-Minimal.new.19354/kiwi-templates-Minimal.changes
2024-10-06 17:51:47.148640723 +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:
------------------
kiwi-templates-Minimal.spec: same change
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.MQvn6d/_old 2024-10-06 17:51:47.784667154 +0200
+++ /var/tmp/diff_new_pack.MQvn6d/_new 2024-10-06 17:51:47.788667320 +0200
@@ -144,10 +144,6 @@
echo "rw quiet systemd.show_status=1 console=ttyS0,115200 console=tty0"
> /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.MQvn6d/_old 2024-10-06 17:51:47.808668151 +0200
+++ /var/tmp/diff_new_pack.MQvn6d/_new 2024-10-06 17:51:47.812668318 +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
