summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
651e0c1)
Grub2 menuentry entry text can use double or single quotes.
Signed-off-by: Geoff Levand <geoff@infradead.org>
return;
if (streq(name, "menuentry")) {
return;
if (streq(name, "menuentry")) {
/* complete any existing option... */
if (state->opt)
grub2_finish(conf);
/* complete any existing option... */
if (state->opt)
grub2_finish(conf);
opt = discover_boot_option_create(conf->dc, conf->dc->device);
opt->option->boot_args = talloc_strdup(opt->option, "");
opt = discover_boot_option_create(conf->dc, conf->dc->device);
opt->option->boot_args = talloc_strdup(opt->option, "");
- sep = strchr(value, '\'');
-
- if (sep)
- *sep = 0;
+ value = strtok(value, "\'{\"");
opt->option->id = talloc_asprintf(opt->option,
"%s#%s", dev->id, value);
opt->option->id = talloc_asprintf(opt->option,
"%s#%s", dev->id, value);