Accepting request 1201684 from devel:openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/1201684
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shim?expand=0&rev=122

shim-install

@@ -60,6 +60,7 @@ fi
 if [ x"${GRUB_DISTRIBUTOR}" = x ] && [ -f "${sysconfdir}/os-release" ] ; then
     . "${sysconfdir}/os-release"
     GRUB_DISTRIBUTOR="${NAME} ${VERSION}"
+    OS_ID="${ID}"
 fi
 
 bootloader_id="$(echo "$GRUB_DISTRIBUTOR" | tr 'A-Z' 'a-z' | cut -d' ' -f1)"
@@ -78,6 +79,16 @@ case "$bootloader_id" in
     *) ca_string="";;
 esac
 
+case "$OS_ID" in
+    "opensuse-leap")
+        ca_string='SUSE Linux Enterprise Secure Boot CA1';;
+esac
+
+# bsc#1230316 For SL-Micro, always install shim/grub2 with the "removable" way
+if test "$GRUB_DISTRIBUTOR" = "SL Micro"; then
+    removable=yes
+fi
+
 is_azure () {
     local bios_vendor;
     local product_name;
@@ -465,6 +476,9 @@ if test "$no_nvram" = no && test -n "$bootloader_id"; then
         $efibootmgr -b "$bootnum" -B
     done
 
+    # bsc#1230316 Skip the creation of the boot option for SL-Micro to make
+    # the system always boot from HDD
+    if test "$GRUB_DISTRIBUTOR" != "SL Micro"; then
         efidir_drive="$("$grub_probe" --target=drive --device-map= "$efidir")"
         efidir_disk="$("$grub_probe" --target=disk --device-map= "$efidir")"
         if test -z "$efidir_drive" || test -z "$efidir_disk"; then
@@ -492,6 +506,7 @@ if test "$no_nvram" = no && test -n "$bootloader_id"; then
             $efibootmgr -c -d "$efidir_disk" -p "$efidir_part" -w \
               -L "$bootloader_id" -l "\\EFI\\$efi_distributor\\$efi_file"
         fi
+    fi
 fi
 
 # bsc#1185464 bsc#1185961

shim.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Sep 16 06:56:21 UTC 2024 - Gary Ching-Pang Lin <glin@suse.com>
+
+- Update shim-install to apply the missing fix for openSUSE Leap
+  (bsc#1210382)
+  * 86b73d1 Fix that bootx64.efi is not updated on Leap
+- Update shim-install to use the 'removable' way for SL-Micro
+  (bsc#1230316)
+  * 433cc4e Always use the removable way for SL-Micro
+
 -------------------------------------------------------------------
 Tue Jun 25 04:12:39 UTC 2024 - Dennis Tseng <dennis.tseng@suse.com>