rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 248825 from home:michael-chang:bnc895884

Browse Source 
- fix xen pvops kernel not appear on menu (bnc#895286)
  * refresh grub2-fix-menu-in-xen-host-server.patch 

- fix extraneous comma in printf shell command (bnc#895884)
  * refresh grub2-btrfs-04-grub2-install.patch

OBS-URL: https://build.opensuse.org/request/show/248825
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=112
This commit is contained in:
Marcus Meissner 2014-09-13 11:15:00 +00:00 committed by Git OBS Bridge
parent b3c9ac672c
commit ace13a15f6
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
grub2-btrfs-04-grub2-install.patch
View File

@ -28,8 +28,8 @@ Index: grub-2.02~beta2/grub-core/osdep/unix/config.c
- strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\n\", " - strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\n\", "
- "\"$GRUB_ENABLE_CRYPTODISK\", \"$GRUB_DISTRIBUTOR\""); - "\"$GRUB_ENABLE_CRYPTODISK\", \"$GRUB_DISTRIBUTOR\"");
+ strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\nSUSE_BTRFS_SNAPSHOT_BOOTING=%s\\n\", " + strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\nSUSE_BTRFS_SNAPSHOT_BOOTING=%s\\n\" "
+ "\"$GRUB_ENABLE_CRYPTODISK\", \"$GRUB_DISTRIBUTOR\", \"$SUSE_BTRFS_SNAPSHOT_BOOTING\""); + "\"$GRUB_ENABLE_CRYPTODISK\" \"$GRUB_DISTRIBUTOR\" \"$SUSE_BTRFS_SNAPSHOT_BOOTING\"");
argv[2] = script; argv[2] = script;
argv[3] = '\0'; argv[3] = '\0';
@ -70,7 +70,7 @@ Index: grub-2.02~beta2/util/grub-install.c
=================================================================== ===================================================================
--- grub-2.02~beta2.orig/util/grub-install.c --- grub-2.02~beta2.orig/util/grub-install.c
+++ grub-2.02~beta2/util/grub-install.c +++ grub-2.02~beta2/util/grub-install.c
@@ -816,6 +816,8 @@ fill_core_services (const char *core_ser @@ -803,6 +803,8 @@ fill_core_services (const char *core_ser
free (sysv_plist); free (sysv_plist);
} }
@ -79,7 +79,7 @@ Index: grub-2.02~beta2/util/grub-install.c
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
@@ -849,6 +851,9 @@ main (int argc, char *argv[]) @@ -836,6 +838,9 @@ main (int argc, char *argv[])
grub_util_load_config (&config); grub_util_load_config (&config);
@ -89,7 +89,7 @@ Index: grub-2.02~beta2/util/grub-install.c
if (!bootloader_id && config.grub_distributor) if (!bootloader_id && config.grub_distributor)
{ {
char *ptr; char *ptr;
@@ -1334,6 +1339,16 @@ main (int argc, char *argv[]) @@ -1305,6 +1310,16 @@ main (int argc, char *argv[])
fprintf (load_cfg_f, "set debug='%s'\n", fprintf (load_cfg_f, "set debug='%s'\n",
debug_image); debug_image);
} }

2
grub2-fix-menu-in-xen-host-server.patch
View File

@ -99,7 +99,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
+ +
+ if test "$xen_pv_domU" = "false" ; then + if test "$xen_pv_domU" = "false" ; then
+ # prevent xen kernel without pv_opt support from booting + # prevent xen kernel without pv_opt support from booting
+ if (grep -qx "CONFIG_XEN=y" "${config}" 2> /dev/null && grep -qvx "CONFIG_PARAVIRT=y" "${config}" 2> /dev/null); then + if (grep -qx "CONFIG_XEN=y" "${config}" 2> /dev/null && ! grep -qx "CONFIG_PARAVIRT=y" "${config}" 2> /dev/null); then
+ echo "Skip xenlinux kernel $linux" >&2 + echo "Skip xenlinux kernel $linux" >&2
+ list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` + list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
+ continue + continue

12
grub2.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Sep 12 04:14:38 UTC 2014 - mchang@suse.com
- fix xen pvops kernel not appear on menu (bnc#895286)
* refresh grub2-fix-menu-in-xen-host-server.patch
-------------------------------------------------------------------
Wed Sep 10 10:34:47 UTC 2014 - mchang@suse.com
- fix extraneous comma in printf shell command (bnc#895884)
* refresh grub2-btrfs-04-grub2-install.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 27 07:53:35 UTC 2014 - schwab@suse.de Wed Aug 27 07:53:35 UTC 2014 - schwab@suse.de