rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 807543 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/807543
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=221
This commit is contained in:
Yuchen Lin 2020-05-26 15:14:05 +00:00 committed by Git OBS Bridge
parent 6fc7da4b50
commit 28bd0aa59a
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
grub2-s390x-skip-zfcpdump-image.patch Normal file
View File

@ -0,0 +1,17 @@
Index: grub-2.04/util/grub-mkconfig_lib.in
===================================================================
--- grub-2.04.orig/util/grub-mkconfig_lib.in
+++ grub-2.04/util/grub-mkconfig_lib.in
@@ -189,6 +189,12 @@ grub_file_is_not_garbage ()
*.rpmsave|*.rpmnew) return 1 ;;
README*|*/README*) return 1 ;; # documentation
*.sig) return 1 ;; # signatures
+ # Skip zfcpdump kernel from the grub boot menu (bsc#1166513) The zfcpdump
+ # kernel image is used by zipl to prepare a SCSI dump disc and is only
+ # intended to boot from that disk for creating kernel crash dumps,
+ # therefore booting it from grub is not making sense and also will result
+ # in unbootable system.
+ *-zfcpdump) return 1 ;; # s390 zfcpdump image
esac
else
return 1

6
grub2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon May 18 08:15:01 UTC 2020 - Michael Chang <mchang@suse.com>
- Skip zfcpdump kernel from the grub boot menu (bsc#1166513)
* grub2-s390x-skip-zfcpdump-image.patch
-------------------------------------------------------------------
Tue May 5 06:48:55 UTC 2020 - Michael Chang <mchang@suse.com>

2
grub2.spec
View File

@ -225,6 +225,7 @@ Patch93: grub2-getroot-support-nvdimm.patch
Patch94: grub2-install-fix-not-a-directory-error.patch
Patch95: grub2-verifiers-fix-system-freeze-if-verify-failed.patch
Patch96: grub-install-force-journal-draining-to-ensure-data-i.patch
Patch97: grub2-s390x-skip-zfcpdump-image.patch
# Btrfs snapshot booting related patches
Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
Patch102: grub2-btrfs-02-export-subvolume-envvars.patch
@ -548,6 +549,7 @@ swap partition while in resuming
%patch94 -p1
%patch95 -p1
%patch96 -p1
%patch97 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1