forked from pool/grub2
8ee92f5194
- Implement NV index mode for TPM 2.0 key protector
0001-protectors-Implement-NV-index.patch
- Fall back to passphrase mode when the key protector fails to
unlock the disk
0002-cryptodisk-Fallback-to-passphrase.patch
- Wipe out the cached key cleanly
0003-cryptodisk-wipe-out-the-cached-keys-from-protectors.patch
- Make diskfiler to look up cryptodisk devices first
0004-diskfilter-look-up-cryptodisk-devices-first.patch
- Version bump to 2.12~rc1
* Added:
- grub-2.12~rc1.tar.xz
* Removed:
- grub-2.06.tar.xz
* Patch dropped merged by new version:
- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-efi-chainloader-root.patch
- grub2-Fix-incorrect-netmask-on-ppc64.patch
- 0001-osdep-Introduce-include-grub-osdep-major.h-and-use-i.patch
- 0002-osdep-linux-hostdisk-Use-stat-instead-of-udevadm-for.patch
- 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
- grub2-s390x-10-keep-network-at-kexec.patch
- 0001-Fix-build-error-in-binutils-2.36.patch
- 0001-emu-fix-executable-stack-marking.patch
- 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
- 0001-30_uefi-firmware-fix-printf-format-with-null-byte.patch
- 0001-tpm-Pass-unknown-error-as-non-fatal-but-debug-print-.patch
- 0001-Filter-out-POSIX-locale-for-translation.patch
OBS-URL: https://build.opensuse.org/request/show/1105405
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=458
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From: Stefan Seyfried <seife@novell.slipkontur.de>
|
|
Subject: Makefile.am: makes sure that ext2/3/4 is tried before minix
|
|
References: boo#1161641
|
|
|
|
I recently came across a strange grub2-install error when building kiwi images
|
|
in OBS. The reason is a bug in the minix file system detection. I filed
|
|
upstream bug [1].
|
|
|
|
Note I experienced this on SLES15-SP1. The bug is still present in current
|
|
Tumbleweed [2]. This bug thus needs fixing in all supported openSUSE releases.
|
|
|
|
The reproducer-script is called as root like
|
|
|
|
bash ./grub-bug-57652-reproduce-suse.sh /tmp/grub-test.img /mnt
|
|
|
|
/tmp needs 1GB of free storage to store the image.
|
|
|
|
Maybe this would be good enough as a minimal-intrusive fix. It does not fix the
|
|
minix detection code, but instead makes sure that ext[234] is tried before
|
|
minix.
|
|
|
|
[1] https://savannah.gnu.org/bugs/index.php?57652
|
|
[2] https://bugzilla.opensuse.org/attachment.cgi?id=828118
|
|
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -51,8 +51,11 @@
|
|
-D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1)
|
|
CLEANFILES += libgrub.pp
|
|
|
|
+# the grep/sed ensures that ext2 gets initialized before minix*
|
|
+# see https://savannah.gnu.org/bugs/?57652
|
|
libgrub_a_init.lst: libgrub.pp
|
|
cat $< | grep '^@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1)
|
|
+ if grep ^ext2 $@ >/dev/null; then sed '/ext2/d;/newc/iext2' < $@ > $@.tmp && mv $@.tmp $@; fi
|
|
CLEANFILES += libgrub_a_init.lst
|
|
|
|
libgrub_a_init.c: libgrub_a_init.lst $(top_srcdir)/geninit.sh
|