-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
discover/grub2: Fix behavior of save_env -f
Currently, "save_env -f" in the GRUB2 parser only works with three arguments, which means only commands of the form "save_env -f <path>" that save *no* environment variables are allowed. Allow "save_env -f <path> [<var>]*", making "save_env -f" useful. Tested: Unit test test-grub2-save-env-dash-f tests this change, and the remaining unit tests still pass. Signed-off-by: Alan Dunn <amdunn@google.com> Signed-off-by: Sam Mendoza-Jonas <sam@mendozajonas.com>
- Loading branch information
Showing
3 changed files
with
52 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
|
||
#include <string.h> | ||
|
||
#include <talloc/talloc.h> | ||
|
||
#include "parser-test.h" | ||
|
||
#if 0 /* PARSER_EMBEDDED_CONFIG */ | ||
hello=world | ||
save_env -f env_file hello | ||
#endif | ||
|
||
static const char *envsig = "# GRUB Environment Block\n"; | ||
|
||
void run_test(struct parser_test *test) | ||
{ | ||
const char *env_before, *env_after; | ||
|
||
/* The environment file must be preallocated */ | ||
|
||
/* The padding at the end of the environment block is the length of | ||
* "hello=world\n" */ | ||
env_before = talloc_asprintf(test, "%s%s", envsig, | ||
"############"); | ||
test_add_file_data(test, test->ctx->device, "/boot/grub/env_file", | ||
env_before, strlen(env_before)); | ||
|
||
env_after = talloc_asprintf(test, "%s%s", envsig, | ||
"hello=world\n"); | ||
|
||
test_read_conf_embedded(test, "/boot/grub/grub.cfg"); | ||
|
||
test_run_parser(test, "grub2"); | ||
|
||
check_file_contents(test, test->ctx->device, "/boot/grub/env_file", | ||
env_after, strlen(env_after)); | ||
} |