Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package perl-Bootloader for openSUSE:Factory
checked in at 2023-06-03 00:06:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old)
and /work/SRC/openSUSE:Factory/.perl-Bootloader.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader"
Sat Jun 3 00:06:21 2023 rev:206 rq:1090024 version:1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes
2023-05-21 19:08:38.786413890 +0200
+++
/work/SRC/openSUSE:Factory/.perl-Bootloader.new.15902/perl-Bootloader.changes
2023-06-03 00:06:32.629748069 +0200
@@ -1,0 +2,8 @@
+Wed May 31 13:54:55 UTC 2023 - wfe...@opensuse.org
+
+- merge gh#openSUSE/perl-bootloader#148
+- UEFI: update also default location, if it is controlled by SUSE
+ (bsc#1210799, bsc#1201399)
+- 1.2
+
+--------------------------------------------------------------------
Old:
----
perl-Bootloader-1.1.tar.xz
New:
----
perl-Bootloader-1.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.aTcoIJ/_old 2023-06-03 00:06:33.129751021 +0200
+++ /var/tmp/diff_new_pack.aTcoIJ/_new 2023-06-03 00:06:33.133751045 +0200
@@ -25,7 +25,7 @@
%{!?_distconfdir:%global _distconfdir /etc}
Name: perl-Bootloader
-Version: 1.1
+Version: 1.2
Release: 0
Requires: coreutils
Requires: perl-base = %{perl_version}
++++++ perl-Bootloader-1.1.tar.xz -> perl-Bootloader-1.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.1/VERSION
new/perl-Bootloader-1.2/VERSION
--- old/perl-Bootloader-1.1/VERSION 2023-05-19 16:52:26.000000000 +0200
+++ new/perl-Bootloader-1.2/VERSION 2023-05-31 15:54:55.000000000 +0200
@@ -1 +1 @@
-1.1
+1.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.1/changelog
new/perl-Bootloader-1.2/changelog
--- old/perl-Bootloader-1.1/changelog 2023-05-19 16:52:26.000000000 +0200
+++ new/perl-Bootloader-1.2/changelog 2023-05-31 15:54:55.000000000 +0200
@@ -1,3 +1,8 @@
+2023-05-31: 1.2
+ - merge gh#openSUSE/perl-bootloader#148
+ - UEFI: update also default location, if it is controlled by SUSE
+ (bsc#1210799, bsc#1201399)
+
2023-05-19: 1.1
- merge gh#openSUSE/perl-bootloader#144
- add default-settings script
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-1.1/grub2-efi/install
new/perl-Bootloader-1.2/grub2-efi/install
--- old/perl-Bootloader-1.1/grub2-efi/install 2023-05-19 16:52:26.000000000
+0200
+++ new/perl-Bootloader-1.2/grub2-efi/install 2023-05-31 15:54:55.000000000
+0200
@@ -7,6 +7,31 @@
# bootloader, language
#
+
+# If the default EFI boot file is signed by SUSE, assume we have to also
update it.
+#
+# This is also the logic shim uses.
+#
+check_update_default ()
+{
+ . /etc/os-release
+
+ case "$NAME" in
+ SLE*)
+ ca_string='SUSE Linux Enterprise Secure Boot CA1';;
+ openSUSE*)
+ ca_string='openSUSE Secure Boot CA1';;
+ esac
+
+ efi_default_file="/boot/efi/EFI/boot/$efi_default"
+
+ update_default=0
+
+ if [ -n "$ca_string" -a -f $efi_default_file ] ; then
+ grep -q "$ca_string" $efi_default_file && update_default=1
+ fi
+}
+
target=$(uname --hardware-platform)
if [ -z "$target" ] ; then
@@ -17,22 +42,24 @@
fw_platform_size=$(cat /sys/firmware/efi/fw_platform_size 2>/dev/null)
case "$target" in
- i?86 ) target=i386 ;;
+ i?86 ) target=i386 efi_default=bootia32.efi ;;
x86_64 | amd64 )
- target=x86_64
+ target=x86_64 efi_default=bootx64.efi
if [ "$fw_platform_size" = 32 ] ; then
- target=i386
+ target=i386 efi_default=bootia32.efi
# no 32 bit shim
SYS__BOOTLOADER__SECURE_BOOT=no
fi
;;
- aarch64 ) target=arm64 ;;
- arm* ) target=arm ;;
+ aarch64 ) target=arm64 efi_default=bootaa64.efi ;;
+ arm* ) target=arm efi_default=bootarm.efi ;;
esac
+check_update_default
+
target="$target-efi"
-echo "target = $target"
+echo "target = $target, update default location = $update_default"
# We install grub2 at the end of the installation, not within (bsc#979145)
if [ "$YAST_IS_RUNNING" = instsys ]; then
@@ -61,6 +88,8 @@
append=
if [ ! -d /sys/firmware/efi/efivars -o ! -w /sys/firmware/efi/efivars -o !
"$(ls -A /sys/firmware/efi/efivars)" ] ; then
append="$no_nvram_opts"
+ # no need to *additionally* update default location
+ update_default=0
else
has_nvram=1
fi
@@ -90,6 +119,9 @@
( set -x ; /usr/sbin/grub2-install --target="$target" $append
$no_nvram_opts )
fi
( set -x ; /usr/sbin/grub2-install --target="$target" $append )
+ if [ "$update_default" = 1 ] ; then
+ ( set -x ; /usr/sbin/grub2-install --target="$target" $append
$no_nvram_opts )
+ fi
else
echo "grub2-install: command not found"
exit 1
