Accepting request 1148961 from home:michael-chang:branches:Base:System
- Fix grub.xen memdisk script doesn't look for /boot/grub/grub.cfg (bsc#1219248) (bsc#1181762) * grub2-xen-pv-firmware.cfg * 0001-disk-Optimize-disk-iteration-by-moving-memdisk-to-th.patch OBS-URL: https://build.opensuse.org/request/show/1148961 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=489
This commit is contained in:
parent
e7bd68e639
commit
7dfdb912ce
@ -0,0 +1,37 @@
|
||||
From 5846e14a4dbf0c73969a32625d841e4f842ccdea Mon Sep 17 00:00:00 2001
|
||||
From: Michael Chang <mchang@suse.com>
|
||||
Date: Wed, 31 Jan 2024 18:44:27 +0800
|
||||
Subject: [PATCH] disk: Optimize disk iteration by moving memdisk to the end
|
||||
|
||||
When performing file or UUID-based searches, prioritize returning
|
||||
operating system disk devices over the memdisk. The memdisk, typically
|
||||
used for internal grub data, is moved to the last position in the search
|
||||
order. This improves search efficiency and prevents potential unexpected
|
||||
results.
|
||||
|
||||
Signed-off-by: Michael Chang <mchang@suse.com>
|
||||
---
|
||||
include/grub/disk.h | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/grub/disk.h b/include/grub/disk.h
|
||||
index bf0958885..f4fd7a00f 100644
|
||||
--- a/include/grub/disk.h
|
||||
+++ b/include/grub/disk.h
|
||||
@@ -244,7 +244,12 @@ grub_disk_dev_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data)
|
||||
|
||||
for (pull = 0; pull < GRUB_DISK_PULL_MAX; pull++)
|
||||
for (p = grub_disk_dev_list; p; p = p->next)
|
||||
- if (p->disk_iterate && (p->disk_iterate) (hook, hook_data, pull))
|
||||
+ if (p->id != GRUB_DISK_DEVICE_MEMDISK_ID && p->disk_iterate && (p->disk_iterate) (hook, hook_data, pull))
|
||||
+ return 1;
|
||||
+
|
||||
+ for (pull = 0; pull < GRUB_DISK_PULL_MAX; pull++)
|
||||
+ for (p = grub_disk_dev_list; p; p = p->next)
|
||||
+ if (p->id == GRUB_DISK_DEVICE_MEMDISK_ID && p->disk_iterate && (p->disk_iterate) (hook, hook_data, pull))
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
--
|
||||
2.43.0
|
||||
|
@ -56,6 +56,8 @@ fi
|
||||
set hdcfg_list="\
|
||||
/boot/grub2/grub.cfg \
|
||||
/grub2/grub.cfg \
|
||||
/boot/grub/grub.cfg \
|
||||
/grub/grub.cfg\
|
||||
"
|
||||
|
||||
set hdlst_list="\
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 22 04:19:21 UTC 2024 - Michael Chang <mchang@suse.com>
|
||||
|
||||
- Fix grub.xen memdisk script doesn't look for /boot/grub/grub.cfg
|
||||
(bsc#1219248) (bsc#1181762)
|
||||
* grub2-xen-pv-firmware.cfg
|
||||
* 0001-disk-Optimize-disk-iteration-by-moving-memdisk-to-th.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 17 06:59:55 UTC 2024 - Michael Chang <mchang@suse.com>
|
||||
|
||||
|
@ -392,6 +392,7 @@ Patch198: 0001-loader-arm64-efi-linux-Remove-magic-number-header-fi.patch
|
||||
Patch199: 0001-squash-ieee1275-ofpath-enable-NVMeoF-logical-device-.patch
|
||||
Patch200: 0001-ofdisk-enhance-boot-time-by-focusing-on-boot-disk-re.patch
|
||||
Patch201: 0002-ofdisk-add-early_log-support.patch
|
||||
Patch202: 0001-disk-Optimize-disk-iteration-by-moving-memdisk-to-th.patch
|
||||
|
||||
Requires: gettext-runtime
|
||||
%if 0%{?suse_version} >= 1140
|
||||
|
Loading…
Reference in New Issue
Block a user