XXX openSUSE XXX: Prepend partition 3 (and 4 for chromebook snow) to …

…the list of boot partition to load DTB before EFI. It used to be 2 and 3 up to python-kiwi 9.18.34, since swap was the last partition at that time. Keep #2 for compatibility purpose. Fix boo#1163723 Also add new folders to find DTB
openSUSE · Apr 14, 2020 · 5637f1a · 5637f1a
1 parent 36fec02
commit 5637f1a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
@@ -141,7 +141,7 @@
 		"load ${devtype} ${devnum}:${distro_bootpart} "           \
 			"${fdt_addr_r} ${prefix}${efi_fdtfile}\0"         \
 	\
-	"efi_dtb_prefixes=/ /dtb/ /dtb/current/\0"                        \
+	"efi_dtb_prefixes=/ /dtb/ /dtb/current/ /boot/ /boot/dtb/ /boot/dtb/current/\0" \
 	"scan_dev_for_efi="                                               \
 		"setenv efi_fdtfile ${fdtfile}; "                         \
 		BOOTENV_EFI_SET_FDTFILE_FALLBACK                          \
@@ -466,7 +466,7 @@
 	"scan_dev_for_boot_part="                                         \
 		"part list ${devtype} ${devnum} -bootable devplist; "     \
 		"env exists devplist || setenv devplist 1; "              \
-		"for distro_bootpart in ${devplist}; do "                 \
+		"for distro_bootpart in 3 4 2 ${devplist}; do "             \
 			"if fstype ${devtype} "                           \
 					"${devnum}:${distro_bootpart} "   \
 					"bootfstype; then "               \