vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add network functions for grub-menulst2cfg

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-10-05 10:21:32 +02:00
parent 80e722366d
commit 805448e987
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
grub-core/lib/legacy_parse.c
View file

@ -42,7 +42,8 @@ struct legacy_command
TYPE_BOOL, TYPE_BOOL,
TYPE_INT, TYPE_INT,
TYPE_REST_VERBATIM, TYPE_REST_VERBATIM,
TYPE_VBE_MODE TYPE_VBE_MODE,
TYPE_WITH_CONFIGFILE_OPTION
} argt[4]; } argt[4];
enum { enum {
FLAG_IGNORE_REST = 0x001, FLAG_IGNORE_REST = 0x001,
@ -64,7 +65,13 @@ static struct legacy_command legacy_commands[] =
"Print the blocklist notation of the file FILE."}, "Print the blocklist notation of the file FILE."},
{"boot", "boot\n", NULL, 0, 0, {}, 0, 0, {"boot", "boot\n", NULL, 0, 0, {}, 0, 0,
"Boot the OS/chain-loader which has been loaded."}, "Boot the OS/chain-loader which has been loaded."},
/* FIXME: bootp unsupported. */ {"bootp", "net_bootp; net_ls_addr; if [ x%s = x--with-configfile ]; then "
"if net_get_dhcp_option configfile_name pxe 150 string; then "
"configfile $configfile_name; fi; fi\n", NULL, 0, 1,
{TYPE_WITH_CONFIGFILE_OPTION}, FLAG_IGNORE_REST, "[--with-configfile]",
"Initialize a network device via BOOTP. If the option `--with-configfile'"
" is given, try to load a configuration file specified by the 150 vendor"
" tag."},
{"cat", "cat '%s'\n", NULL, 0, 1, {TYPE_FILE}, 0, "FILE", {"cat", "cat '%s'\n", NULL, 0, 1, {TYPE_FILE}, 0, "FILE",
"Print the contents of the file FILE."}, "Print the contents of the file FILE."},
{"chainloader", "chainloader %s '%s'\n", NULL, 0, {"chainloader", "chainloader %s '%s'\n", NULL, 0,
@ -102,7 +109,13 @@ static struct legacy_command legacy_commands[] =
"[NUM | `saved']", "[NUM | `saved']",
"Set the default entry to entry number NUM (if not specified, it is" "Set the default entry to entry number NUM (if not specified, it is"
" 0, the first entry) or the entry number saved by savedefault."}, " 0, the first entry) or the entry number saved by savedefault."},
/* FIXME: dhcp unsupported. */ {"dhcp", "net_bootp; net_ls_addr; if [ x%s = x--with-configfile ]; then "
"if net_get_dhcp_option configfile_name pxe 150 string; then "
"configfile $configfile_name; fi; fi\n", NULL, 0, 1,
{TYPE_WITH_CONFIGFILE_OPTION}, FLAG_IGNORE_REST, "[--with-configfile]",
"Initialize a network device via BOOTP. If the option `--with-configfile'"
" is given, try to load a configuration file specified by the 150 vendor"
" tag."},
{"displayapm", "lsapm\n", NULL, 0, 0, {}, 0, 0, {"displayapm", "lsapm\n", NULL, 0, 0, {}, 0, 0,
"Display APM BIOS information."}, "Display APM BIOS information."},
{"displaymem", "lsmmap\n", NULL, 0, 0, {}, 0, 0, {"displaymem", "lsmmap\n", NULL, 0, 0, {}, 0, 0,
@ -411,6 +424,8 @@ is_option (enum arg_type opt, const char *curarg, grub_size_t len)
{ {
switch (opt) switch (opt)
{ {
case TYPE_WITH_CONFIGFILE_OPTION:
return check_option (curarg, "--with-configfile", len);
case TYPE_NOAPM_OPTION: case TYPE_NOAPM_OPTION:
return check_option (curarg, "--no-apm", len); return check_option (curarg, "--no-apm", len);
case TYPE_FORCE_OPTION: case TYPE_FORCE_OPTION:
@ -662,6 +677,7 @@ grub_legacy_parse (const char *buf, char **entryname, char **suffix)
case TYPE_VERBATIM: case TYPE_VERBATIM:
args[i] = grub_legacy_escape (curarg, curarglen); args[i] = grub_legacy_escape (curarg, curarglen);
break; break;
case TYPE_WITH_CONFIGFILE_OPTION:
case TYPE_FORCE_OPTION: case TYPE_FORCE_OPTION:
case TYPE_NOAPM_OPTION: case TYPE_NOAPM_OPTION:
case TYPE_TYPE_OR_NOMEM_OPTION: case TYPE_TYPE_OR_NOMEM_OPTION:
@ -756,6 +772,7 @@ grub_legacy_parse (const char *buf, char **entryname, char **suffix)
case TYPE_FILE: case TYPE_FILE:
case TYPE_REST_VERBATIM: case TYPE_REST_VERBATIM:
case TYPE_VERBATIM: case TYPE_VERBATIM:
case TYPE_WITH_CONFIGFILE_OPTION:
case TYPE_FORCE_OPTION: case TYPE_FORCE_OPTION:
case TYPE_NOAPM_OPTION: case TYPE_NOAPM_OPTION:
case TYPE_TYPE_OR_NOMEM_OPTION: case TYPE_TYPE_OR_NOMEM_OPTION: