From cdfe0d404b0f67e383832db061a205df3dff1308e286095051b211f20fa62f4a Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 15 May 2024 03:44:07 +0000 Subject: [PATCH] Accepting request 1174099 from home:michael-chang:branches:Base:System - Fix error in /etc/grub.d/20_linux_xen: file_is_not_sym not found, renamed to file_is_not_xen_garbage (bsc#1224226) * grub2-fix-menu-in-xen-host-server.patch OBS-URL: https://build.opensuse.org/request/show/1174099 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=503 --- grub2-fix-menu-in-xen-host-server.patch | 7 ++++++- grub2.changes | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/grub2-fix-menu-in-xen-host-server.patch b/grub2-fix-menu-in-xen-host-server.patch index 00065e1..a7e719d 100644 --- a/grub2-fix-menu-in-xen-host-server.patch +++ b/grub2-fix-menu-in-xen-host-server.patch @@ -21,6 +21,11 @@ Create only hypervisor pointed by /boot/xen.gz symlink to not clutter the menu with multiple versions and also not include -dbg. Use custom.cfg if you need any other custom entries. +v3: +References: bsc#1224226 +Fix the error in /etc/grub.d/20_linux_xen where file_is_not_sym was not +found, as it has been renamed to file_is_not_xen_garbage. + --- util/grub-mkconfig_lib.in | 5 +++++ util/grub.d/10_linux.in | 12 ++++++++++-- @@ -59,7 +64,7 @@ if you need any other custom entries. + # wildcard expasion with correct suffix (.gz) for not generating many duplicated menu entries + xen_list= + for i in /boot/xen*.gz; do -+ if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then xen_list="$xen_list $i" ; fi ++ if grub_file_is_not_garbage "$i" && file_is_not_xen_garbage "$i" ; then xen_list="$xen_list $i" ; fi + done +fi prepare_boot_cache= diff --git a/grub2.changes b/grub2.changes index a763cec..3b145cf 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 15 00:46:14 UTC 2024 - Michael Chang + +- Fix error in /etc/grub.d/20_linux_xen: file_is_not_sym not found, renamed to + file_is_not_xen_garbage (bsc#1224226) + * grub2-fix-menu-in-xen-host-server.patch + ------------------------------------------------------------------- Thu May 2 07:48:30 UTC 2024 - Michael Chang