CHAR16 kname[FILENAME_MAXLEN];
CHAR16 options[MAX_STRING];
CHAR16 initrd[FILENAME_MAXLEN];
+ CHAR16 vmcode[FILENAME_MAXLEN];
CHAR16 root[FILENAME_MAXLEN];
CHAR16 fallback[MAX_STRING];
CHAR16 description[MAX_STRING];
typedef struct {
CHAR16 root[FILENAME_MAXLEN]; /* globally defined root fs */
CHAR16 initrd[FILENAME_MAXLEN];/* globally defined initrd */
+ CHAR16 vmcode[FILENAME_MAXLEN];/* globally defined boot-time module */
CHAR16 options[MAX_STRING];
CHAR16 default_image_name[MAX_STRING];
CHAR16 message_file[MAX_MESSAGES][FILENAME_MAXLEN];
{OPT_BOOL, OPT_GLOBAL, L"noedd30", NULL, NULL, &global_config.edd30_no_force},
{OPT_CMD, OPT_GLOBAL, L"append", NULL, NULL, global_config.options},
{OPT_FILE, OPT_GLOBAL, L"initrd", NULL, NULL, global_config.initrd},
+{OPT_FILE, OPT_GLOBAL, L"vmm", NULL, NULL, global_config.vmcode},
{OPT_FILE, OPT_GLOBAL, L"image", do_image, NULL, opt_offsetof(kname)},
{OPT_BOOL, OPT_GLOBAL, L"checkalt", NULL, NULL, &global_config.alt_check},
{OPT_STR, OPT_GLOBAL, L"chooser", NULL, check_chooser, global_config.chooser},
{OPT_CMD, OPT_IMAGE, L"append", do_options, NULL, opt_offsetof(options)},
{OPT_CMD, OPT_IMAGE, L"literal", do_literal, NULL, NULL},
{OPT_FILE, OPT_IMAGE, L"initrd", NULL, NULL, opt_offsetof(initrd)},
+ {OPT_FILE, OPT_IMAGE, L"vmm", NULL, NULL, opt_offsetof(vmcode)},
{OPT_STR, OPT_IMAGE, L"label", NULL, NULL, opt_offsetof(label)},
{OPT_FILE, OPT_IMAGE, L"image", do_image, NULL, opt_offsetof(kname)},
{OPT_STR, OPT_IMAGE, L"description", NULL, NULL, opt_offsetof(description)},
}
EFI_STATUS
-read_config(CHAR16 *filename, INTN retry)
+read_config(CHAR16 *filename)
{
EFI_STATUS status;
INTN ret;
status = fops_open(filename, &config_fd);
if (EFI_ERROR(status)) {
- /*
- * if the user explicitely specified a filename and we can't
- * find it, then we must fail.
- */
- if (elilo_opt.parse_only || retry == 0) {
- VERB_PRT(3, Print(L"cannot open config file %s\n", filename));
- return status;
- }
- /*
- * if not already submitted filename,
- */
- if (StrCmp(filename, ELILO_ARCH_DEFAULT_CONFIG)) {
- /*
- * try the arch default file, now
- */
- VERB_PRT(3,Print(L"config file %s not found, trying %s\n",
- filename, ELILO_ARCH_DEFAULT_CONFIG));
-
- StrCpy(global_config.config_file,ELILO_ARCH_DEFAULT_CONFIG);
-
- status = fops_open(ELILO_ARCH_DEFAULT_CONFIG, &config_fd);
- }
- /*
- * if arch specific did not work, try generic
- */
- if (EFI_ERROR(status) && StrCmp(filename, ELILO_DEFAULT_CONFIG)) {
- /*
- * try the default file as a last resort
- */
- VERB_PRT(3,Print(L"config file %s not found, trying %s\n",
- ELILO_ARCH_DEFAULT_CONFIG, ELILO_DEFAULT_CONFIG));
-
- StrCpy(global_config.config_file, ELILO_DEFAULT_CONFIG);
- status = fops_open(ELILO_DEFAULT_CONFIG, &config_fd);
- }
- /*
- * if nothing worked, then bail out
- */
- if (EFI_ERROR(status)) {
- VERB_PRT(3, Print(L"no valid config file found\n"));
- global_config.config_file[0] = CHAR_NULL;
- return status;
- }
+ VERB_PRT(3, Print(L"cannot open config file %s\n", filename));
+ return status;
}
/*
* start numbering at line 1
{
boot_image_t *img, *dfl = global_config.default_image;
- if (dfl) Print(L"%s ", dfl->label);
+ if (dfl) Print(L"\t%s\n", dfl->label);
for (img = image_list; img; img = img->next) {
- if (img != dfl) Print(L"%s ", img->label);
+ if (img != dfl) Print(L"\t%s\n", img->label);
}
}
}
INTN
-find_label(CHAR16 *label, CHAR16 *kname, CHAR16 *options, CHAR16 *initrd)
+find_label(CHAR16 *label, CHAR16 *kname, CHAR16 *options, CHAR16 *initrd, CHAR16 *vmcode)
{
boot_image_t *img;
if (global_config.readonly) StrCat(options, L" ro");
if (global_config.initrd[0]) StrCpy(initrd, global_config.initrd);
+ if (global_config.vmcode[0]) StrCpy(vmcode, global_config.vmcode);
/* make sure we don't get garbage here */
elilo_opt.sys_img_opts = NULL;
else if (global_config.initrd[0])
StrCpy(initrd, global_config.initrd);
+ if (img->vmcode[0])
+ StrCpy(vmcode, img->vmcode);
+ else if (global_config.vmcode[0])
+ StrCpy(vmcode, global_config.vmcode);
+
/*
* point to architecture dependent options for this image
*/
elilo_opt.sys_img_opts = &img->sys_img_opts;
- DBG_PRT((L"label %s: kname=%s options=%s initrd=%s", img->label, kname, options, initrd));
+ DBG_PRT((L"label %s: kname=%s options=%s initrd=%s vmcode=%s", img->label, kname, options, initrd, vmcode));
return 0;
}