222 |
.mbHyperFirst = 1, |
.mbHyperFirst = 1, |
223 |
.mbInitRdIsModule = 1, |
.mbInitRdIsModule = 1, |
224 |
.mbAllowExtraInitRds = 1, |
.mbAllowExtraInitRds = 1, |
225 |
|
.titlePosition = 1, |
226 |
}; |
}; |
227 |
|
|
228 |
struct keywordTypes grub2Keywords[] = { |
struct keywordTypes grub2Keywords[] = { |
595 |
.needsBootPrefix = 1, |
.needsBootPrefix = 1, |
596 |
.argsInQuotes = 1, |
.argsInQuotes = 1, |
597 |
.mbConcatArgs = 1, |
.mbConcatArgs = 1, |
598 |
|
.titlePosition = 1, |
599 |
}; |
}; |
600 |
|
|
601 |
struct configFileInfo liloConfigType = { |
struct configFileInfo liloConfigType = { |
604 |
.entryStart = LT_KERNEL, |
.entryStart = LT_KERNEL, |
605 |
.argsInQuotes = 1, |
.argsInQuotes = 1, |
606 |
.maxTitleLength = 15, |
.maxTitleLength = 15, |
607 |
|
.titlePosition = 1, |
608 |
}; |
}; |
609 |
|
|
610 |
struct configFileInfo yabootConfigType = { |
struct configFileInfo yabootConfigType = { |
615 |
.argsInQuotes = 1, |
.argsInQuotes = 1, |
616 |
.maxTitleLength = 15, |
.maxTitleLength = 15, |
617 |
.mbAllowExtraInitRds = 1, |
.mbAllowExtraInitRds = 1, |
618 |
|
.titlePosition = 1, |
619 |
}; |
}; |
620 |
|
|
621 |
struct configFileInfo siloConfigType = { |
struct configFileInfo siloConfigType = { |
625 |
.needsBootPrefix = 1, |
.needsBootPrefix = 1, |
626 |
.argsInQuotes = 1, |
.argsInQuotes = 1, |
627 |
.maxTitleLength = 15, |
.maxTitleLength = 15, |
628 |
|
.titlePosition = 1, |
629 |
}; |
}; |
630 |
|
|
631 |
struct configFileInfo ziplConfigType = { |
struct configFileInfo ziplConfigType = { |
645 |
.maxTitleLength = 255, |
.maxTitleLength = 255, |
646 |
.mbAllowExtraInitRds = 1, |
.mbAllowExtraInitRds = 1, |
647 |
.defaultIsUnquoted = 1, |
.defaultIsUnquoted = 1, |
648 |
|
.titlePosition = 1, |
649 |
}; |
}; |
650 |
|
|
651 |
struct grubConfig { |
struct grubConfig { |
834 |
} |
} |
835 |
|
|
836 |
/* extract the title from within brackets (for zipl) */ |
/* extract the title from within brackets (for zipl) */ |
837 |
static char * extractTitle(struct singleLine * line) { |
static char * extractTitle(struct grubConfig *cfg, struct singleLine * line) { |
838 |
/* bracketed title... let's extract it */ |
/* bracketed title... let's extract it */ |
839 |
char * title = NULL; |
char * title = NULL; |
840 |
|
if (cfg->cfi == &grub2ConfigType) |
841 |
|
return grub2ExtractTitle(line); |
842 |
if (line->type == LT_TITLE) { |
if (line->type == LT_TITLE) { |
843 |
title = strdup(line->elements[0].item + 1); |
char *tmp = line->elements[cfg->cfi->titlePosition].item; |
844 |
*(title + strlen(title) - 1) = '\0'; |
if (cfg->cfi->titleBracketed) { |
845 |
|
tmp++; |
846 |
|
title = strdup(tmp); |
847 |
|
*(title + strlen(title) - 1) = '\0'; |
848 |
|
} else { |
849 |
|
title = strdup(tmp); |
850 |
|
} |
851 |
} else if (line->type == LT_MENUENTRY) |
} else if (line->type == LT_MENUENTRY) |
852 |
title = strdup(line->elements[1].item); |
title = strdup(line->elements[1].item); |
853 |
else |
else |
1455 |
line->elements[1].item)) break; |
line->elements[1].item)) break; |
1456 |
} else if (line) { |
} else if (line) { |
1457 |
if (!strcmp(defaultLine->elements[1].item, |
if (!strcmp(defaultLine->elements[1].item, |
1458 |
extractTitle(line))) break; |
extractTitle(cfg, line))) break; |
1459 |
} |
} |
1460 |
i++; |
i++; |
1461 |
entry = NULL; |
entry = NULL; |
1506 |
if (!line) |
if (!line) |
1507 |
line = getLineByType(LT_TITLE, entry->lines); |
line = getLineByType(LT_TITLE, entry->lines); |
1508 |
if (line) { |
if (line) { |
1509 |
title = extractTitle(line); |
title = extractTitle(cfg, line); |
1510 |
if (title) |
if (title) |
1511 |
cfg->cfi->setEnv(cfg->cfi, "saved_entry", title); |
cfg->cfi->setEnv(cfg->cfi, "saved_entry", title); |
1512 |
} |
} |
1544 |
else if (line && (line->numElements == 1) && |
else if (line && (line->numElements == 1) && |
1545 |
cfg->cfi->titleBracketed) { |
cfg->cfi->titleBracketed) { |
1546 |
fprintf(out, "%sdefault%s%s\n", indent, separator, |
fprintf(out, "%sdefault%s%s\n", indent, separator, |
1547 |
extractTitle(line)); |
extractTitle(cfg, line)); |
1548 |
} |
} |
1549 |
} |
} |
1550 |
} |
} |
3346 |
if (!line) |
if (!line) |
3347 |
continue; |
continue; |
3348 |
|
|
3349 |
linetitle = extractTitle(line); |
linetitle = extractTitle(cfg, line); |
3350 |
if (!linetitle) |
if (!linetitle) |
3351 |
continue; |
continue; |
3352 |
if (strcmp(title, linetitle)) { |
if (strcmp(title, linetitle)) { |
3400 |
if (!line) |
if (!line) |
3401 |
continue; |
continue; |
3402 |
|
|
3403 |
linetitle = extractTitle(line); |
linetitle = extractTitle(cfg, line); |
3404 |
if (!linetitle) |
if (!linetitle) |
3405 |
continue; |
continue; |
3406 |
if (strcmp(title, linetitle)) { |
if (strcmp(title, linetitle)) { |