c85662cbfa
- Merge changes from SLE12
- add grub2-emu-4-all.patch
* Build 'grub2-emu' wherever possible, to allow a better
implementation of that feature.
- add grub2-s390x-06-loadparm.patch,
- add grub2-commands-introduce-read_file-subcommand.patch:
* allow s390x to telecontrol grub2. (bsc#891946, bsc#892852)
- add grub2-s390x-06-loadparm.patch:
* ignore case and fix transliteration of parameter. (bsc#891946)
- add grub2-s390x-07-add-image-param-for-zipl-setup.patch
* Add --image switch to force zipl update to specific kernel
(bsc#928131)
- add grub2-s390x-08-workaround-part-to-disk.patch
* Ignore partition tables on s390x. (bsc#935127)
- add grub2-efi-chainload-harder.patch:
* allow XEN to be chain-loaded despite firmware flaws. (bnc#887793)
* Do not use shim lock protocol for reading pe header, it won't be
available when secure boot disabled (bsc#943380)
* Make firmware flaw condition be more precisely detected and add
debug message for the case
* Check msdos header to find PE file header (bsc#954126)
- grub2-s390x-04-grub2-install.patch:
* streamline boot to grub menu. (bsc#898198)
* Force '/usr' to read-only before calling kexec. (bsc#932951)
- grub2-once:
* add '--enum' option to enumerate boot-entries in a way
actually understood by 'grub2'. (bsc#892852, bsc#892811)
* Examine variables from grub environment in 'grub2-once'. (fate#319632)
OBS-URL: https://build.opensuse.org/request/show/457610
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=254
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
--- grub-2.02~beta2.orig/util/s390x/zipl2grub.pl.in 2015-09-15 07:29:51.473202000 -0600
|
|
+++ grub-2.02~beta2/util/s390x/zipl2grub.pl.in 2015-09-15 07:34:12.559142000 -0600
|
|
@@ -7,6 +7,9 @@ my $in = '@sysconfdir@/default/zipl2grub
|
|
my $default = '@sysconfdir@/default/grub';
|
|
my $fallback = '@sysconfdir@/zipl.conf';
|
|
my $sysconfbl = '@sysconfdir@/sysconfig/bootloader';
|
|
+my $defimage = "/boot/image";
|
|
+my $definitrd = "/boot/initrd";
|
|
+my $Image = "$defimage";
|
|
my $zipldir = "";
|
|
my $running = "";
|
|
my $refresh = 1; # needs to default to "on" until most bugs are shaken out!
|
|
@@ -166,7 +169,7 @@ sub Usage($) {
|
|
my $msg = "";
|
|
|
|
$msg .= sprintf( "%s: %s\n", $C, $cat[$_[0]]) if ($_[0] > 0);
|
|
- $msg .= "Usage: $C [-v] [-d] [-f] [-T template] [-z ZIPLDIR]\n";
|
|
+ $msg .= "Usage: $C [-v] [-d] [-f] [-T template] [-z ZIPLDIR] [-i imagepath]\n";
|
|
Panic( $_[0], $msg . "\n");
|
|
}
|
|
|
|
@@ -184,6 +187,7 @@ while ( $#ARGV >= 0 ) {
|
|
(/^--?help/ || /^-h/) && (Usage(0));
|
|
(/^--zipldir$/ || /^-z$/) && ($zipldir = shift || Usage(2), next);
|
|
(/^--template$/ || /^-T$/) && ($in = shift || Usage(3), next);
|
|
+ (/^--image$/ || /^-i$/) && ($Image = shift || Usage(5), $force = 1, next);
|
|
(/^-/) && (Usage(1));
|
|
Usage(1);
|
|
}
|
|
@@ -379,11 +383,8 @@ if ( ! $debug ) {
|
|
}
|
|
|
|
# copy out kernel and initrd
|
|
-my $defimage = "/boot/image";
|
|
-my $definitrd = "/boot/initrd";
|
|
my $ziplimage = "$zipldir/image";
|
|
my $ziplinitrd = "$zipldir/initrd";
|
|
-my $Image = "$defimage";
|
|
|
|
if ( ! $running && ! $force ) {
|
|
chomp( $running = qx{uname -r});
|