Accepting request 623078 from Base:System

OBS-URL: https://build.opensuse.org/request/show/623078
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=189

0001-xfs-Accept-filesystem-with-sparse-inodes.patch

@@ -0,0 +1,57 @@
+From cda0a857dd7a27cd5d621747464bfe71e8727fff Mon Sep 17 00:00:00 2001
+From: Daniel Kiper <daniel.kiper@oracle.com>
+Date: Tue, 29 May 2018 16:16:02 +0200
+Subject: [PATCH] xfs: Accept filesystem with sparse inodes
+
+The sparse inode metadata format became a mkfs.xfs default in
+xfsprogs-4.16.0, and such filesystems are now rejected by grub as
+containing an incompatible feature.
+
+In essence, this feature allows xfs to allocate inodes into fragmented
+freespace.  (Without this feature, if xfs could not allocate contiguous
+space for 64 new inodes, inode creation would fail.)
+
+In practice, the disk format change is restricted to the inode btree,
+which as far as I can tell is not used by grub.  If all you're doing
+today is parsing a directory, reading an inode number, and converting
+that inode number to a disk location, then ignoring this feature
+should be fine, so I've added it to XFS_SB_FEAT_INCOMPAT_SUPPORTED
+
+I did some brief testing of this patch by hacking up the regression
+tests to completely fragment freespace on the test xfs filesystem, and
+then write a large-ish number of inodes to consume any existing
+contiguous 64-inode chunk.  This way any files the grub tests add and
+traverse would be in such a fragmented inode allocation.  Tests passed,
+but I'm not sure how to cleanly integrate that into the test harness.
+
+Signed-off-by: Eric Sandeen <sandeen@redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+Tested-by: Chris Murphy <lists@colorremedies.com>
+---
+ grub-core/fs/xfs.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+Index: grub-2.02/grub-core/fs/xfs.c
+===================================================================
+--- grub-2.02.orig/grub-core/fs/xfs.c
++++ grub-2.02/grub-core/fs/xfs.c
+@@ -79,9 +79,18 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define XFS_SB_FEAT_INCOMPAT_SPINODES   (1 << 1)        /* sparse inode chunks */
+ #define XFS_SB_FEAT_INCOMPAT_META_UUID  (1 << 2)        /* metadata UUID */
+ 
+-/* We do not currently verify metadata UUID so it is safe to read such filesystem */
++/*
++ * Directory entries with ftype are explicitly handled by GRUB code.
++ *
++ * We do not currently read the inode btrees, so it is safe to read filesystems
++ * with the XFS_SB_FEAT_INCOMPAT_SPINODES feature.
++ *
++ * We do not currently verify metadata UUID, so it is safe to read filesystems
++ * with the XFS_SB_FEAT_INCOMPAT_META_UUID feature.
++ */
+ #define XFS_SB_FEAT_INCOMPAT_SUPPORTED \
+ 	(XFS_SB_FEAT_INCOMPAT_FTYPE | \
++	 XFS_SB_FEAT_INCOMPAT_SPINODES | \
+ 	 XFS_SB_FEAT_INCOMPAT_META_UUID)
+ 
+ struct grub_xfs_sblock

grub2.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Jul 16 07:53:19 UTC 2018 - mchang@suse.com
+
+- Fix install on xfs error (bsc#1101283)
+  * 0001-xfs-Accept-filesystem-with-sparse-inodes.patch
+
+-------------------------------------------------------------------
+Tue Jul 10 15:57:50 UTC 2018 - jbohac@suse.cz
+
+- grub2.spec: change %config to %config(noreplace)
+  Don't overwrite user changes to config files on upgrades.
+
 -------------------------------------------------------------------
 Wed Jul  4 12:55:30 UTC 2018 - josef.moellers@suse.com
 

grub2.spec

@@ -217,6 +217,7 @@ Patch85:        grub2-getroot-scan-disk-pv.patch
 Patch86:        0001-Fix-packed-not-aligned-error-on-GCC-8.patch
 Patch87:        0001-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled-MMIO-da.patch
 Patch88:        unix-exec-avoid-atexit-handlers-when-child-exits.patch
+Patch89:        0001-xfs-Accept-filesystem-with-sparse-inodes.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
 %patch86 -p1
 %patch87 -p1
 %patch88 -p1
+%patch89 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -1032,13 +1034,13 @@ fi
 %config(noreplace) %{_sysconfdir}/default/grub
 %dir %{_sysconfdir}/grub.d
 %{_sysconfdir}/grub.d/README
-%config %{_sysconfdir}/grub.d/00_header
-%config %{_sysconfdir}/grub.d/10_linux
-%config %{_sysconfdir}/grub.d/20_linux_xen
+%config(noreplace) %{_sysconfdir}/grub.d/00_header
+%config(noreplace) %{_sysconfdir}/grub.d/10_linux
+%config(noreplace) %{_sysconfdir}/grub.d/20_linux_xen
 %config(noreplace) %{_sysconfdir}/grub.d/40_custom
-%config %{_sysconfdir}/grub.d/41_custom
-%config %{_sysconfdir}/grub.d/90_persistent
-%config %{_sysconfdir}/grub.d/95_textmode
+%config(noreplace) %{_sysconfdir}/grub.d/41_custom
+%config(noreplace) %{_sysconfdir}/grub.d/90_persistent
+%config(noreplace) %{_sysconfdir}/grub.d/95_textmode
 %{_sbindir}/%{name}-install
 %{_sbindir}/%{name}-mkconfig
 %{_sbindir}/%{name}-once
@@ -1100,7 +1102,7 @@ fi
 %{_mandir}/man1/%{name}-emu.1.*
 %endif
 %ifnarch s390x
-%config %{_sysconfdir}/grub.d/30_os-prober
+%config(noreplace) %{_sysconfdir}/grub.d/30_os-prober
 %{_bindir}/%{name}-glue-efi
 %{_bindir}/%{name}-mount
 %{_sbindir}/%{name}-bios-setup
@@ -1124,11 +1126,11 @@ fi
 %files %{grubarch}
 %defattr(-,root,root,-)
 %ifarch %{ix86} x86_64
-%config %{_sysconfdir}/grub.d/20_memtest86+
+%config(noreplace) %{_sysconfdir}/grub.d/20_memtest86+
 %endif
 %dir %{_libdir}/%{name}/%{grubarch}
 %ifarch ppc ppc64 ppc64le
-%config %{_sysconfdir}/grub.d/20_ppc_terminfo
+%config(noreplace) %{_sysconfdir}/grub.d/20_ppc_terminfo
 # This is intentionally "grub.chrp" and not "%{name}.chrp"
 %{_libdir}/%{name}/%{grubarch}/grub.chrp
 %{_libdir}/%{name}/%{grubarch}/bootinfo.txt
@@ -1183,7 +1185,7 @@ fi
 %defattr(-,root,root,-)
 %dir %{_libdir}/snapper
 %dir %{_libdir}/snapper/plugins
-%config %{_sysconfdir}/grub.d/80_suse_btrfs_snapshot
+%config(noreplace) %{_sysconfdir}/grub.d/80_suse_btrfs_snapshot
 %{_libdir}/snapper/plugins/grub
 
 %ifarch %{ix86} x86_64