proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-10-25 17:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

grub-install-common: Add --sbat option

Browse Source 
Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Dimitri John Ledkov 2021-02-22 17:05:25 +00:00 committed by Daniel Kiper
parent b115471377
commit bb51ee2b49
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/grub/util/install.h
View File

@ -63,6 +63,8 @@
/* TRANSLATORS: "embed" is a verb (command description). "*/ \ /* TRANSLATORS: "embed" is a verb (command description). "*/ \
{ "pubkey", 'k', N_("FILE"), 0, \ { "pubkey", 'k', N_("FILE"), 0, \
N_("embed FILE as public key for signature checking"), 0}, \ N_("embed FILE as public key for signature checking"), 0}, \
{ "sbat", GRUB_INSTALL_OPTIONS_SBAT, N_("FILE"), 0, \
N_("SBAT metadata"), 0 }, \
{ "verbose", 'v', 0, 0, \ { "verbose", 'v', 0, 0, \
N_("print verbose messages."), 1 } N_("print verbose messages."), 1 }
@ -122,7 +124,8 @@ enum grub_install_options {
GRUB_INSTALL_OPTIONS_THEMES_DIRECTORY, GRUB_INSTALL_OPTIONS_THEMES_DIRECTORY,
GRUB_INSTALL_OPTIONS_GRUB_MKIMAGE, GRUB_INSTALL_OPTIONS_GRUB_MKIMAGE,
GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS, GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS,
GRUB_INSTALL_OPTIONS_DTB GRUB_INSTALL_OPTIONS_DTB,
GRUB_INSTALL_OPTIONS_SBAT
}; };
extern char *grub_install_source_directory; extern char *grub_install_source_directory;

12
util/grub-install-common.c
View File

@ -332,6 +332,7 @@ handle_install_list (struct install_list *il, const char *val,
static char **pubkeys; static char **pubkeys;
static size_t npubkeys; static size_t npubkeys;
static char *sbat;
static grub_compression_t compression; static grub_compression_t compression;
int int
@ -362,6 +363,12 @@ grub_install_parse (int key, char *arg)
* (npubkeys + 1)); * (npubkeys + 1));
pubkeys[npubkeys++] = xstrdup (arg); pubkeys[npubkeys++] = xstrdup (arg);
return 1; return 1;
case GRUB_INSTALL_OPTIONS_SBAT:
if (sbat)
free (sbat);
sbat = xstrdup (arg);
return 1;
case GRUB_INSTALL_OPTIONS_VERBOSITY: case GRUB_INSTALL_OPTIONS_VERBOSITY:
verbosity++; verbosity++;
@ -523,9 +530,10 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
grub_util_info ("grub-mkimage --directory '%s' --prefix '%s'" grub_util_info ("grub-mkimage --directory '%s' --prefix '%s'"
" --output '%s' " " --output '%s' "
" --dtb '%s' " " --dtb '%s' "
"--sbat '%s' "
"--format '%s' --compression '%s' %s %s\n", "--format '%s' --compression '%s' %s %s\n",
dir, prefix, dir, prefix,
outname, dtb ? : "", mkimage_target, outname, dtb ? : "", sbat ? : "", mkimage_target,
compnames[compression], note ? "--note" : "", s); compnames[compression], note ? "--note" : "", s);
free (s); free (s);
@ -536,7 +544,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
grub_install_generate_image (dir, prefix, fp, outname, grub_install_generate_image (dir, prefix, fp, outname,
modules.entries, memdisk_path, modules.entries, memdisk_path,
pubkeys, npubkeys, config_path, tgt, pubkeys, npubkeys, config_path, tgt,
note, compression, dtb, NULL); note, compression, dtb, sbat);
while (dc--) while (dc--)
grub_install_pop_module (); grub_install_pop_module ();
} }