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 2025-02-21 21:35:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-MicroOS (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.1873 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-MicroOS"
Fri Feb 21 21:35:45 2025 rev:85 rq:1247690 version:16.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/openSUSE-MicroOS/openSUSE-MicroOS.changes
2024-12-06 14:25:25.762079673 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.1873/openSUSE-MicroOS.changes
2025-02-21 21:36:03.943484296 +0100
@@ -1,0 +2,10 @@
+Fri Feb 21 12:38:04 UTC 2025 - Fabian Vogt <[email protected]>
+
+- config.sh: Do not rely on $kiwi_btrfs_root_is_snapshot (boo#1237466)
+
+-------------------------------------------------------------------
+Thu Feb 20 16:07:14 UTC 2025 - Fabian Vogt <[email protected]>
+
+- Clean up config.sh and disk.sh
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.TEFzXN/_old 2025-02-21 21:36:04.591511278 +0100
+++ /var/tmp/diff_new_pack.TEFzXN/_new 2025-02-21 21:36:04.591511278 +0100
@@ -68,16 +68,20 @@
#=====================================
# Configure snapper
#-------------------------------------
-if [ "${kiwi_btrfs_root_is_snapshot-false}" = 'true' ]; then
- echo "creating initial snapper config ..."
- cp /etc/snapper/config-templates/default /etc/snapper/configs/root \
+if [ -x /usr/bin/snapper ]; then
+ echo "creating initial snapper config ..."
+ cp /etc/snapper/config-templates/default /etc/snapper/configs/root \
|| cp /usr/share/snapper/config-templates/default
/etc/snapper/configs/root
- baseUpdateSysConfig /etc/sysconfig/snapper SNAPPER_CONFIGS root
+ baseUpdateSysConfig /etc/sysconfig/snapper SNAPPER_CONFIGS root
# Adjust parameters
sed -i'' 's/^TIMELINE_CREATE=.*$/TIMELINE_CREATE="no"/g'
/etc/snapper/configs/root
sed -i'' 's/^NUMBER_LIMIT=.*$/NUMBER_LIMIT="2-10"/g'
/etc/snapper/configs/root
sed -i''
's/^NUMBER_LIMIT_IMPORTANT=.*$/NUMBER_LIMIT_IMPORTANT="4-10"/g'
/etc/snapper/configs/root
+else
+ # Avoid boo#1237466 from reoccuring
+ echo "snapper not installed?"
+ exit 1
fi
#=====================================
@@ -156,7 +160,7 @@
*OpenStack*) ignition_platform='openstack' ;;
*VirtualBox*) ignition_platform='virtualbox' ;;
*HyperV*) ignition_platform='metal'
- cmdline+=('rootdelay=300') ;;
+ cmdline+=('rootdelay=300') ;;
*Pine64*|*RaspberryPi*|*Rock64*|*Vagrant*) ignition_platform='metal' ;;
# Use autodetection on selfinstall. The first boot doesn't use the grub
# cmdline anyway, it's started with kexec using kiwi's builtin default.
@@ -184,8 +188,14 @@
test -f /.autorelabel && mv /.autorelabel /etc/selinux/.autorelabel
fi
-if [ -e /etc/default/grub ]; then
+if rpm -q sdbootutil; then
+ mkdir -p /etc/kernel
+ echo "${cmdline[*]}" > /etc/kernel/cmdline
+elif [ -e /etc/default/grub ]; then
sed -i
"s#^GRUB_CMDLINE_LINUX_DEFAULT=.*\$#GRUB_CMDLINE_LINUX_DEFAULT=\"${cmdline[*]}\"#"
/etc/default/grub
+else
+ echo "Unknown bootloader"
+ exit 1
fi
#======================================
@@ -242,21 +252,21 @@
# Configure Vagrant specifics
#--------------------------------------
if [[ "$kiwi_profiles" == *"Vagrant"* ]]; then
- echo "Add user vagrant"
- # create vagrant user
- useradd vagrant
- # allow password-less sudo
- echo "vagrant ALL=(ALL)NOPASSWD:ALL" > /etc/sudoers.d/vagrant
- # add vagrant's insecure key
- mkdir -p /home/vagrant/.ssh
- chmod 0700 /home/vagrant/.ssh
- cat > /home/vagrant/.ssh/authorized_keys << EOF
+ echo "Add user vagrant"
+ # create vagrant user
+ useradd vagrant
+ # allow password-less sudo
+ echo "vagrant ALL=(ALL)NOPASSWD:ALL" > /etc/sudoers.d/vagrant
+ # add vagrant's insecure key
+ mkdir -p /home/vagrant/.ssh
+ chmod 0700 /home/vagrant/.ssh
+ cat > /home/vagrant/.ssh/authorized_keys << EOF
ssh-rsa
AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ==
vagrant insecure public key
EOF
- chmod 0600 /home/vagrant/.ssh/authorized_keys
- chown -R vagrant /home/vagrant
+ chmod 0600 /home/vagrant/.ssh/authorized_keys
+ chown -R vagrant /home/vagrant
- echo "Disable jeos-firstboot.service for Vagrant boxes"
+ echo "Disable jeos-firstboot.service for Vagrant boxes"
systemctl disable jeos-firstboot.service
systemctl mask jeos-firstboot.service
fi
@@ -264,20 +274,11 @@
#======================================
# 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
- echo "${cmdline[*]}" > /etc/kernel/cmdline
-
[ -e /var/lib/YaST2/reconfig_system ] && systemctl enable
sdbootutil-enroll.service
fi
++++++ disk.sh ++++++
--- /var/tmp/diff_new_pack.TEFzXN/_old 2025-02-21 21:36:04.607511944 +0100
+++ /var/tmp/diff_new_pack.TEFzXN/_new 2025-02-21 21:36:04.611512111 +0100
@@ -1,38 +1,37 @@
#!/bin/bash
set -euxo pipefail
-[ -x /usr/bin/sdbootutil ] || exit 0
echo "####### BOOTLOADER INSTALL (disk.sh)"
-# [[ "$kiwi_profiles" == *"kvm-and-xen-"* ]]
-if rpm -q sdbootutil; then
- arch="$(uname -m)"
- case "$arch" in
- aarch64) arch=aa64 ;;
- x86_64) arch=x64 ;;
- *) echo "Unknown arch $arch"; exit 1 ;;
- 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
- # Set a 5s timeout, the "hold a key down" method doesn't work effectively.
- echo "timeout 5" >> /boot/efi/loader/loader.conf
+if [ -x /usr/bin/sdbootutil ]; then
+ arch="$(uname -m)"
+ case "$arch" in
+ aarch64) arch=aa64 ;;
+ x86_64) arch=x64 ;;
+ *) echo "Unknown arch $arch"; exit 1 ;;
+ 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
+ # 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
+ rm -f /boot/mbrid
- find /boot
+ find /boot
fi
-echo "####### ENDS BOOTLOADER INSTALLER (disk.sh)"
+echo "####### END BOOTLOADER INSTALL (disk.sh)"
