|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] tools/xl: reject bootloader=pygrub in case pygrub is disabled
commit a8a7c33e7dd684966d7df66058f2397995dbae31
Author: Juergen Gross <jgross@xxxxxxxx>
AuthorDate: Wed Aug 9 09:05:55 2023 +0200
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Aug 9 09:05:55 2023 +0200
tools/xl: reject bootloader=pygrub in case pygrub is disabled
In case Xen has been configured with "--disable-pygrub", don't accept
the domain config option "bootloader=pygrub".
Suggested-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
Acked-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
---
tools/xl/xl_parse.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c
index 1a5556d3bb..0e8c604bbf 100644
--- a/tools/xl/xl_parse.c
+++ b/tools/xl/xl_parse.c
@@ -1692,6 +1692,15 @@ void parse_config_data(const char *config_source,
xlu_cfg_get_defbool(config, "acpi", &b_info->acpi, 0);
xlu_cfg_replace_string (config, "bootloader", &b_info->bootloader, 0);
+#ifndef HAVE_PYGRUB
+ if (b_info->bootloader &&
+ (!strcmp(b_info->bootloader, "pygrub") ||
+ !strcmp(b_info->bootloader, "/usr/bin/pygrub"))) {
+ fprintf(stderr, "ERROR: this instance of Xen has been built without
support of \"pygrub\".\n");
+ exit(-ERROR_FAIL);
+ }
+#endif
+
switch (xlu_cfg_get_list_as_string_list(config, "bootloader_args",
&b_info->bootloader_args, 1)) {
case 0:
--
generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |