Accepting request 571597 from Base:System

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

grub2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -160,6 +160,7 @@ Source15:       grub2-once.service
 Source16:       grub2-xen-pv-firmware.cfg
 # required hook for systemd-sleep (bsc#941758)
 Source17:       grub2-systemd-sleep.sh
+Source18:       grub2-check-default.sh
 Source1000:     PATCH_POLICY
 Patch1:         rename-grub-info-file-to-grub2.patch
 Patch2:         grub2-linux.patch
@@ -213,6 +214,7 @@ Patch82:        grub2-diskfilter-support-pv-without-metadatacopies.patch
 Patch83:        grub2-efi-uga-64bit-fb.patch
 Patch84:        grub2-s390x-09-improve-zipl-setup.patch
 Patch85:        grub2-install-remove-useless-check-PReP-partition-is-empty.patch
+Patch86:        grub2-getroot-scan-disk-pv.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
@@ -273,6 +275,9 @@ Patch412:       0013-tpm-i386-pc-diskboot-img.patch
 # UEFI HTTP and related network protocol support (FATE#320130)
 Patch420:       0001-add-support-for-UEFI-network-protocols.patch
 Patch421:       0002-AUDIT-0-http-boot-tracker-bug.patch
+# check if default entry need to be corrected for updated distributor version 
+# and/or use fallback entry if default kernel entry removed (bsc#1065349)
+Patch430:       grub2-mkconfig-default-entry-correction.patch
 
 Requires:       gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -487,6 +492,7 @@ swap partition while in resuming
 %patch83 -p1
 %patch84 -p1
 %patch85 -p1
+%patch86 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -537,6 +543,7 @@ swap partition while in resuming
 %patch412 -p1
 %patch420 -p1
 %patch421 -p1
+%patch430 -p1
 # patches above may update the timestamp of grub.texi
 # and via build-aux/mdate-sh they end up in grub2.info, breaking build-compare
 [ -z "$SOURCE_DATE_EPOCH" ] ||\
@@ -795,6 +802,7 @@ install -m 755 -D %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/80_suse_btrfs
 install -m 644 -D %{SOURCE15} $RPM_BUILD_ROOT%{_unitdir}/grub2-once.service
 install -m 755 -D %{SOURCE17} $RPM_BUILD_ROOT%{_libdir}/systemd/system-sleep/grub2.sleep
 %endif
+install -m 755 -D %{SOURCE18} $RPM_BUILD_ROOT%{_sbindir}/grub2-check-default
 
 R=$RPM_BUILD_ROOT
 %ifarch %{ix86} x86_64
@@ -1018,6 +1026,7 @@ fi
 %{_sbindir}/%{name}-probe
 %{_sbindir}/%{name}-reboot
 %{_sbindir}/%{name}-set-default
+%{_sbindir}/%{name}-check-default
 %{_bindir}/%{name}-editenv
 %{_bindir}/%{name}-file
 %{_bindir}/%{name}-fstest