/*
* Copyright (C) 2001-2003 Hewlett-Packard Co.
* Contributed by Stephane Eranian <eranian@hpl.hp.com>
+ * Contributed by Fenghua Yu <fenghua.yu@intel.com>
+ * Contributed by Bibo Mao <bibo.mao@intel.com>
+ * Contributed by Chandramouli Narayanan <mouli@linux.intel.com>
*
* This file is part of the ELILO, the EFI Linux boot loader.
*
#define ELILO_ARCH_DEFAULT_CONFIG L"elilo-ia64.conf"
#elif defined (CONFIG_ia32)
#define ELILO_ARCH_DEFAULT_CONFIG L"elilo-ia32.conf"
+#elif defined (CONFIG_x86_64)
+#define ELILO_ARCH_DEFAULT_CONFIG L"elilo-x86_64.conf"
#else
#error "You need to specfy your default arch config file"
#endif
*/
#define ELILO_DEFAULT_CONFIG L"elilo.conf"
-#define MAX_STRING CMDLINE_MAXLEN
+#define MAX_STRING 512
#define CONFIG_BUFSIZE 512 /* input buffer size */
/*
struct boot_image *next;
CHAR16 label[MAX_STRING];
CHAR16 kname[FILENAME_MAXLEN];
- CHAR16 options[MAX_STRING];
+ CHAR16 options[CMDLINE_MAXLEN];
CHAR16 initrd[FILENAME_MAXLEN];
CHAR16 vmcode[FILENAME_MAXLEN];
CHAR16 root[FILENAME_MAXLEN];
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 options[CMDLINE_MAXLEN];
CHAR16 default_image_name[MAX_STRING];
CHAR16 message_file[MAX_MESSAGES][FILENAME_MAXLEN];
CHAR16 chooser[FILENAME_MAXLEN];/* which image chooser to use */
static VOID
config_error(CHAR16 *msg,...)
{
- va_list ap;
- extern UINTN _IPrint (UINTN, UINTN, SIMPLE_TEXT_OUTPUT_INTERFACE *, CHAR16 *, CHAR8 *, va_list);
-
Print(L"near line %d: ",line_num);
-
- va_start(ap,msg);
- _IPrint((UINTN)-1, (UINTN)-1, systab->ConOut, msg, NULL, ap);
- va_end(ap);
+ IPrint(systab->ConOut, msg);
Print(L"\n");
}
back = 0;
return ch;
}
- return getc();
+/*
+ * config files served from pxe/tftpboot windows servers can contain
+ * extraneous '\r' characters, often the first char in the file, and
+ * we need to simply skip over those and continue on
+ */
+ ch = getc();
+ if(ch == '\r')
+ ch = getc();
+
+ return ch;
}
/*
* - TOK_ERR: in case of (parsing) error
*/
static token_t
-get_token(CHAR16 *str, UINTN maxlen)
+get_token_core(CHAR16 *str, UINTN maxlen, BOOLEAN rhs)
{
INTN ch, escaped;
CHAR16 *here;
for (;;) {
- while ((ch = next()), ch == ' ' || ch == '\t' || ch == '\n') if (ch == '\n') line_num++;
+ while ((ch = next()), ch == ' ' || ch == '\t' || ch == '\n') if (ch == '\n' ) line_num++;
if (ch == CHAR_EOF) return TOK_EOF;
+ /* skip comment line */
if (ch != '#') break;
- /* skip comment line */
while ((ch = next()), ch != '\n') if (ch == CHAR_EOF) return TOK_EOF;
line_num++;
}
- if (ch == '=') return TOK_EQUAL;
+ if (ch == '=' && !rhs) return TOK_EQUAL;
if (ch == '"') {
here = str;
}
else {
if (ch == ' ' || ch == '\t' || ch == '\n' || ch == '#' ||
- ch == '=' || ch == CHAR_EOF) {
+ ch == CHAR_EOF || (ch == '=' && !rhs)) {
again(ch);
*here = 0;
return TOK_STR;
return TOK_ERR;
}
+static token_t
+get_token(CHAR16 *str, UINTN maxlen)
+{
+ return get_token_core(str, maxlen, FALSE);
+}
+
+static token_t
+get_token_rhs(CHAR16 *str, UINTN maxlen)
+{
+ return get_token_core(str, maxlen, TRUE);
+}
+
static INTN
image_check(boot_image_t *img)
{
/*
* now get the value
*/
- tok = get_token(str, maxlen);
+ tok = get_token_rhs(str, maxlen);
if (tok != TOK_STR) {
config_error(L"Option %s expects %s", p->name, msg);
return -1;
if (tok == TOK_EOF) break;
- if (tok == TOK_ERR) return -1;
+ if (tok == TOK_ERR) {
+ Print(L"Bad Token from elilo config file, parser read: %s\n elilo exiting\n", str);
+ return -1;
+ }
if ( (p = find_option(current_options, str)) == NULL) {
config_error(L"Unkown option %s", str);
{
boot_image_t *img, *dfl = global_config.default_image;
- if (dfl) Print(L"\t%s\n", dfl->label);
+ if (dfl) Print(L" %s\n", dfl->label);
for (img = image_list; img; img = img->next) {
- if (img != dfl) Print(L"\t%s\n", img->label);
+ if (img != dfl) Print(L" %s\n", img->label);
}
}
return NULL;
}
+static void
+add_root_to_options(CHAR16 *options, CHAR16 *root, CHAR16 *vmcode)
+{
+ CHAR16 *o, ko[CMDLINE_MAXLEN];
+
+ if (vmcode[0]) {
+ for (o = options; *o; o++) {
+ if (*o == '-' && *(o+1) == '-')
+ break;
+ }
+ if (! *o) {
+ /* no separator found, add one */
+ StrCpy(o, L" -- ");
+ o++;
+ }
+
+ /* advance past separator and whitespace */
+ o += 2;
+ while (*o == ' ') o++;
+ } else {
+ o = options;
+ }
+
+ /* insert root param at this point */
+ StrCpy(ko, o);
+ StrCpy(o, L"root=");
+ StrCat(o, root);
+ StrCat(o, L" ");
+ StrCat(o, ko);
+}
+
INTN
find_label(CHAR16 *label, CHAR16 *kname, CHAR16 *options, CHAR16 *initrd, CHAR16 *vmcode)
{
/*
* when the label does not exist, we still propagate the global options
*/
- if (global_config.root[0]) {
- StrCpy(options, L" root=");
- StrCat(options, global_config.root);
- }
-
if (global_config.options[0]) {
StrCat(options, L" ");
StrCat(options, global_config.options);
}
+ if (global_config.root[0])
+ add_root_to_options(options, global_config.root, global_config.vmcode);
if (global_config.readonly) StrCat(options, L" ro");
if (global_config.initrd[0]) StrCpy(initrd, global_config.initrd);
found:
StrCpy(kname, img->kname);
+ /* per image initrd has precedence over global initrd */
+ if (img->initrd[0])
+ StrCpy(initrd, img->initrd);
+ else
+ StrCpy(initrd, global_config.initrd);
+
+ /* per image vmcode has precedence over global vmcode */
+ if (img->vmcode[0])
+ StrCpy(vmcode, img->vmcode);
+ else
+ StrCpy(vmcode, global_config.vmcode);
+
/*
* literal option overrides any other image-based or global option
*
* In any case, the image option has priority over the global option
*/
if (img->literal == 0) {
- if (img->root[0] || global_config.root[0]) {
- StrCat(options, L"root=");
- StrCat(options, img->root[0] ? img->root : global_config.root);
- }
/* XXX: check max length */
if (img->options[0] || global_config.options[0]) {
StrCat(options, L" ");
StrCat(options, img->options[0] ? img->options: global_config.options);
}
+ if (img->root[0] || global_config.root[0]) {
+ add_root_to_options(options, img->root[0]
+ ? img->root : global_config.root, vmcode);
+ }
if (img->readonly || global_config.readonly) {
StrCat(options, L" ro");
}
StrCpy(options, img->options);
}
- /* per image initrd has precedence over global initrd */
- if (img->initrd[0])
- StrCpy(initrd, img->initrd);
- 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
*/
projects / debian / elilo / blobdiff