pool/grub2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 618170 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/618170
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=186
This commit is contained in:
Dominique Leuenberger 2018-06-25 09:33:36 +00:00 committed by Git OBS Bridge
parent f3271bf16c
commit a5083a196e
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
grub2-btrfs-help-on-snapper-rollback.patch Normal file
View File

@ -0,0 +1,21 @@
Index: grub-2.02/util/grub.d/00_header.in
===================================================================
--- grub-2.02.orig/util/grub.d/00_header.in
+++ grub-2.02/util/grub.d/00_header.in
@@ -417,8 +417,14 @@ if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" =
# Note: No $snapshot_num on *read-only* rollback! (bsc#901487)
cat <<EOF
if [ -n "\$extra_cmdline" ]; then
- submenu "Bootable snapshot #\$snapshot_num" {
- menuentry "If OK, run 'snapper rollback' and reboot." { true; }
+ menuentry "Help on bootable snapshot #\$snapshot_num" {
+ echo "Select the default entry of the snapshot boot menu."
+ echo "Examine the snapshot, and if it's OK,"
+ echo " run 'snapper rollback' and reboot."
+ echo "See 'System Rollback by Booting from Snapshots'"
+ echo " in the manual for more information."
+ echo " ** Hit Any Key to return to boot menu ** "
+ read
}
fi
EOF

13
grub2.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Jun 20 09:21:48 UTC 2018 - josef.moellers@suse.com
- Added "# needssslcertforbuild", which got lost somewhere,
to spec file
[grub2.spec]
-------------------------------------------------------------------
Fri Jun 15 09:33:17 UTC 2018 - josef.moellers@suse.com
- Replace confusing menu on btrfs "snapper rollback" by help text.
[bsc#1027588, grub2-btrfs-help-on-snapper-rollback.patch]
-------------------------------------------------------------------
Thu May 24 11:02:04 CEST 2018 - kukuk@suse.de

2
grub2.spec
View File

@ -288,6 +288,7 @@ Patch430: grub2-mkconfig-default-entry-correction.patch
Patch431: grub2-s390x-10-keep-network-at-kexec.patch
# Use pkg-config to find Freetype2
Patch500: grub2-freetype-pkgconfig.patch
Patch501: grub2-btrfs-help-on-snapper-rollback.patch
Requires: gettext-runtime
%if 0%{?suse_version} >= 1140
@ -562,6 +563,7 @@ swap partition while in resuming
%patch430 -p1
%patch431 -p1
%patch500 -p1
%patch501 -p1
%build
# patches above may update the timestamp of grub.texi