Accepting request 769926 from home:michael-chang:branches:Base:System

- From Stefan Seyfried <seife@novell.slipkontur.de> : Fix grub2-install fails
  with "not a directory" error (boo#1161641, bsc#1162403)
  * grub2-install-fix-not-a-directory-error.patch

OBS-URL: https://build.opensuse.org/request/show/769926
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=345

grub2-install-fix-not-a-directory-error.patch

@@ -0,0 +1,40 @@
+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
+
+Index: grub-2.04/Makefile.am
+===================================================================
+--- grub-2.04.orig/Makefile.am
++++ grub-2.04/Makefile.am
+@@ -42,8 +42,11 @@ libgrub.pp: grub_script.tab.h grub_scrip
+ 	  -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

grub2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb  4 07:59:40 UTC 2020 - Michael Chang <mchang@suse.com>
+
+- From Stefan Seyfried <seife@novell.slipkontur.de> : Fix grub2-install fails
+  with "not a directory" error (boo#1161641, bsc#1162403)
+  * grub2-install-fix-not-a-directory-error.patch
+
 -------------------------------------------------------------------
 Wed Nov 27 17:09:42 UTC 2019 - olaf@aepfle.de
 

grub2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -222,6 +222,7 @@ Patch84:        grub2-s390x-09-improve-zipl-setup.patch
 Patch85:        grub2-getroot-scan-disk-pv.patch
 Patch92:        grub2-util-30_os-prober-multiple-initrd.patch
 Patch93:        grub2-getroot-support-nvdimm.patch
+Patch94:        grub2-install-fix-not-a-directory-error.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
@@ -506,6 +507,7 @@ swap partition while in resuming
 %patch85 -p1
 %patch92 -p1
 %patch93 -p1
+%patch94 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1