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
71 lines
1.8 KiB
Diff
71 lines
1.8 KiB
Diff
From: Raymund Will <rw@suse.com>
|
||
Subject: Introduce a 'read_file' sub-command.
|
||
References: bsc#892852, bsc#891946
|
||
Patch-Mainline: not yet
|
||
|
||
Needed to allow s390x-emu to be telecontrolled via LOADPARM.
|
||
---
|
||
grub-core/commands/read.c | 34 ++++++++++++++++++++++++++++++++++
|
||
1 file changed, 34 insertions(+)
|
||
|
||
--- a/grub-core/commands/read.c
|
||
+++ b/grub-core/commands/read.c
|
||
@@ -20,6 +20,7 @@
|
||
#include <grub/dl.h>
|
||
#include <grub/misc.h>
|
||
#include <grub/mm.h>
|
||
+#include <grub/normal.h>
|
||
#include <grub/env.h>
|
||
#include <grub/term.h>
|
||
#include <grub/types.h>
|
||
@@ -77,16 +78,49 @@ grub_cmd_read (grub_command_t cmd __attr
|
||
return 0;
|
||
}
|
||
|
||
+static grub_err_t
|
||
+grub_cmd_read_from_file (grub_command_t cmd __attribute__ ((unused)), int argc, char **args)
|
||
+{
|
||
+ char *line;
|
||
+ int i = 0;
|
||
+ grub_file_t file;
|
||
+
|
||
+ if (argc < 1)
|
||
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("file name expected"));
|
||
+ if (argc < 2)
|
||
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("variable name expected"));
|
||
+ file = grub_file_open (args[i++]);
|
||
+ if (! file)
|
||
+ return grub_errno;
|
||
+ while ( i < argc )
|
||
+ {
|
||
+ line = grub_file_getline (file);
|
||
+ if ( !line )
|
||
+ break;
|
||
+ grub_env_set (args[i++], line);
|
||
+ grub_free (line);
|
||
+ }
|
||
+ grub_file_close (file);
|
||
+ if (i != argc)
|
||
+ return GRUB_ERR_OUT_OF_RANGE;
|
||
+ return 0;
|
||
+}
|
||
+
|
||
static grub_command_t cmd;
|
||
+static grub_command_t cme;
|
||
|
||
GRUB_MOD_INIT(read)
|
||
{
|
||
cmd = grub_register_command ("read", grub_cmd_read,
|
||
N_("[ENVVAR]"),
|
||
N_("Set variable with user input."));
|
||
+ cme = grub_register_command ("read_file", grub_cmd_read_from_file,
|
||
+ N_("FILE ENVVAR [...]"),
|
||
+ N_("Set variable(s) with line(s) from FILE."));
|
||
}
|
||
|
||
GRUB_MOD_FINI(read)
|
||
{
|
||
grub_unregister_command (cmd);
|
||
+ grub_unregister_command (cme);
|
||
}
|