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-03 20:29:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-MicroOS (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.18349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-MicroOS"
Wed Jul 3 20:29:07 2024 rev:76 rq:1184820 version:16.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/openSUSE-MicroOS/openSUSE-MicroOS.changes
2024-06-17 19:27:01.516838875 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.18349/openSUSE-MicroOS.changes
2024-07-03 20:29:39.843667917 +0200
@@ -1,0 +2,10 @@
+Wed Jun 19 09:32:16 UTC 2024 - Alberto Planas Dominguez <[email protected]>
+
+- Refactor config.sh and disk.sh
+
+-------------------------------------------------------------------
+Fri Jun 7 11:02:21 UTC 2024 - Alberto Planas Dominguez <[email protected]>
+
+- Add ignition to fde images
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-MicroOS.kiwi ++++++
--- /var/tmp/diff_new_pack.M5bKiB/_old 2024-07-03 20:29:41.259719745 +0200
+++ /var/tmp/diff_new_pack.M5bKiB/_new 2024-07-03 20:29:41.263719891 +0200
@@ -584,7 +584,7 @@
<volume name="boot/grub2/x86_64-efi"
mountpoint="boot/grub2/x86_64-efi"/>
<volume name="boot/writable"/>
<volume name="usr/local"/>
- <volume name="var" copy_on_write="false"/>
+ <volume name="var" copy_on_write="false"/>
</systemdisk>
<vagrantconfig provider="libvirt" virtualsize="24"/>
<size unit="G">24</size>
@@ -693,6 +693,8 @@
<package name="patterns-base-bootloader"/>
</packages>
<packages type="image" profiles="kvm-and-xen-sdboot">
+ <!-- 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"/>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.M5bKiB/_old 2024-07-03 20:29:41.327722234 +0200
+++ /var/tmp/diff_new_pack.M5bKiB/_new 2024-07-03 20:29:41.331722380 +0200
@@ -183,8 +183,6 @@
if [ -e /etc/default/grub ]; then
sed -i
"s#^GRUB_CMDLINE_LINUX_DEFAULT=.*\$#GRUB_CMDLINE_LINUX_DEFAULT=\"${cmdline[*]}\"#"
/etc/default/grub
-else
- echo "${cmdline[*]}" > /etc/kernel/cmdline
fi
#======================================
@@ -255,15 +253,21 @@
chown -R vagrant /home/vagrant
fi
+#======================================
+# Configure FDE/BLS specifics
+#--------------------------------------
+# [[ "$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
fi
++++++ disk.sh ++++++
--- /var/tmp/diff_new_pack.M5bKiB/_old 2024-07-03 20:29:41.347722966 +0200
+++ /var/tmp/diff_new_pack.M5bKiB/_new 2024-07-03 20:29:41.351723112 +0200
@@ -1,23 +1,32 @@
#!/bin/bash
set -euxo pipefail
[ -x /usr/bin/sdbootutil ] || exit 0
-echo "#######DISK"
-rootuuid=$(findmnt / -n --output uuid)
-sed -i -e "s,\$, root=UUID=$rootuuid," /etc/kernel/cmdline
-arch="$(uname -m)"
-case "$arch" in
+
+echo "####### BOOTLOADER INSTALL (disk.sh)"
+
+# [[ "$kiwi_profiles" == *"kvm-and-xen-"* ]]
+if rpm -q sdbootutil; then
+ rootuuid=$(findmnt / -n --output uuid)
+ sed -i -e "s,\$, root=UUID=$rootuuid," /etc/kernel/cmdline
+ arch="$(uname -m)"
+ case "$arch" in
aarch64) arch=aa64 ;;
x86_64) arch=x64 ;;
*) echo "Unknown arch $arch"; exit 1 ;;
-esac
-echo "install boot loader"
-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
-# Set a 5s timeout, the "hold a key down" method doesn't work effectively.
-echo "timeout 5" >> /boot/efi/loader/loader.conf
-echo "##### AFTER ####"
-rm -f /boot/mbrid
-find /boot
+ esac
+
+ echo "install boot loader"
+ 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
+ # Set a 5s timeout, the "hold a key down" method doesn't work effectively.
+ echo "timeout 5" >> /boot/efi/loader/loader.conf
+
+ rm -f /boot/mbrid
+
+ find /boot
+fi
+
+echo "####### ENDS BOOTLOADER INSTALLER (disk.sh)"
