62e3547e57
- Version bump to 2.04
* removed
- translations-20170427.tar.xz
* grub2.spec
- Make signed grub-tpm.efi specific to x86_64-efi build, the platform
currently shipped with tpm module from upstream codebase
- Add shim_lock to signed grub.efi in x86_64-efi build
- x86_64: linuxefi now depends on linux, both will verify kernel via
shim_lock
- Remove translation tarball and po file hacks as it's been included in
upstream tarball
* rediff
- grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch
- grub2-commands-introduce-read_file-subcommand.patch
- grub2-secureboot-add-linuxefi.patch
- 0001-add-support-for-UEFI-network-protocols.patch
- grub2-efi-HP-workaround.patch
- grub2-secureboot-install-signed-grub.patch
- grub2-linux.patch
- use-grub2-as-a-package-name.patch
- grub2-pass-corret-root-for-nfsroot.patch
- grub2-secureboot-use-linuxefi-on-uefi.patch
- grub2-secureboot-no-insmod-on-sb.patch
- grub2-secureboot-provide-linuxefi-config.patch
- grub2-secureboot-chainloader.patch
- grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-s390x-04-grub2-install.patch
- grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
- grub2-efi-chainloader-root.patch
OBS-URL: https://build.opensuse.org/request/show/741033
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=340
89 lines
2.4 KiB
Diff
89 lines
2.4 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.
|
||
|
||
v2: Added GRUB_FILE_TYPE_READ_ENVVAR as file type by read_file sub-command
|
||
tracked by verifier framework.
|
||
|
||
---
|
||
grub-core/commands/read.c | 34 ++++++++++++++++++++++++++++++++++
|
||
1 file changed, 34 insertions(+)
|
||
|
||
Index: grub-2.04~rc1/grub-core/commands/read.c
|
||
===================================================================
|
||
--- grub-2.04~rc1.orig/grub-core/commands/read.c
|
||
+++ grub-2.04~rc1/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++], GRUB_FILE_TYPE_READ_ENVVAR);
|
||
+ 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);
|
||
}
|
||
Index: grub-2.04~rc1/include/grub/file.h
|
||
===================================================================
|
||
--- grub-2.04~rc1.orig/include/grub/file.h
|
||
+++ grub-2.04~rc1/include/grub/file.h
|
||
@@ -122,6 +122,7 @@ enum grub_file_type
|
||
GRUB_FILE_TYPE_FS_SEARCH,
|
||
GRUB_FILE_TYPE_AUDIO,
|
||
GRUB_FILE_TYPE_VBE_DUMP,
|
||
+ GRUB_FILE_TYPE_READ_ENVVAR,
|
||
|
||
GRUB_FILE_TYPE_LOADENV,
|
||
GRUB_FILE_TYPE_SAVEENV,
|