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[] = { |
583 |
{ "initrd", LT_INITRD, ' ', ',' }, |
{ "initrd", LT_INITRD, ' ', ',' }, |
584 |
{ "append", LT_KERNELARGS, ' ' }, |
{ "append", LT_KERNELARGS, ' ' }, |
585 |
{ "prompt", LT_UNKNOWN, ' ' }, |
{ "prompt", LT_UNKNOWN, ' ' }, |
586 |
|
{ "fdt", LT_DEVTREE, ' ' }, |
587 |
|
{ "fdtdir", LT_DEVTREE, ' ' }, |
588 |
{ NULL, 0, 0 }, |
{ NULL, 0, 0 }, |
589 |
}; |
}; |
590 |
int useextlinuxmenu; |
int useextlinuxmenu; |
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 (leaks a byte) */ |
/* bracketed title... let's extract it */ |
839 |
char * title = NULL; |
char * title = NULL; |
840 |
if (line->type == LT_TITLE) { |
if (line->type == LT_TITLE) { |
841 |
title = strdup(line->elements[0].item); |
char *tmp = line->elements[cfg->cfi->titlePosition].item; |
842 |
title++; |
if (cfg->cfi->titleBracketed) { |
843 |
*(title + strlen(title) - 1) = '\0'; |
tmp++; |
844 |
|
title = strdup(tmp); |
845 |
|
*(title + strlen(title) - 1) = '\0'; |
846 |
|
} else { |
847 |
|
title = strdup(tmp); |
848 |
|
} |
849 |
} else if (line->type == LT_MENUENTRY) |
} else if (line->type == LT_MENUENTRY) |
850 |
title = strdup(line->elements[1].item); |
title = strdup(line->elements[1].item); |
851 |
else |
else |
1453 |
line->elements[1].item)) break; |
line->elements[1].item)) break; |
1454 |
} else if (line) { |
} else if (line) { |
1455 |
if (!strcmp(defaultLine->elements[1].item, |
if (!strcmp(defaultLine->elements[1].item, |
1456 |
extractTitle(line))) break; |
extractTitle(cfg, line))) break; |
1457 |
} |
} |
1458 |
i++; |
i++; |
1459 |
entry = NULL; |
entry = NULL; |
1504 |
if (!line) |
if (!line) |
1505 |
line = getLineByType(LT_TITLE, entry->lines); |
line = getLineByType(LT_TITLE, entry->lines); |
1506 |
if (line) { |
if (line) { |
1507 |
title = extractTitle(line); |
title = extractTitle(cfg, line); |
1508 |
if (title) |
if (title) |
1509 |
cfg->cfi->setEnv(cfg->cfi, "saved_entry", title); |
cfg->cfi->setEnv(cfg->cfi, "saved_entry", title); |
1510 |
} |
} |
1542 |
else if (line && (line->numElements == 1) && |
else if (line && (line->numElements == 1) && |
1543 |
cfg->cfi->titleBracketed) { |
cfg->cfi->titleBracketed) { |
1544 |
fprintf(out, "%sdefault%s%s\n", indent, separator, |
fprintf(out, "%sdefault%s%s\n", indent, separator, |
1545 |
extractTitle(line)); |
extractTitle(cfg, line)); |
1546 |
} |
} |
1547 |
} |
} |
1548 |
} |
} |
1973 |
} |
} |
1974 |
|
|
1975 |
indexVars[i + 1] = -1; |
indexVars[i + 1] = -1; |
1976 |
|
|
1977 |
i = 0; |
i = 0; |
1978 |
if (index) { |
if (index) { |
1979 |
while (i < *index) i++; |
while (i < *index) { |
1980 |
if (indexVars[i] == -1) return NULL; |
i++; |
1981 |
|
if (indexVars[i] == -1) return NULL; |
1982 |
|
} |
1983 |
} |
} |
1984 |
|
|
1985 |
entry = findEntryByIndex(config, indexVars[i]); |
entry = findEntryByIndex(config, indexVars[i]); |
2133 |
} else { |
} else { |
2134 |
entry = findEntryByTitle(cfg, defTitle, &index); |
entry = findEntryByTitle(cfg, defTitle, &index); |
2135 |
} |
} |
2136 |
if (entry) |
if (entry && suitableImage(entry, prefix, skipRemoved, flags)) { |
2137 |
cfg->defaultImage = index; |
cfg->defaultImage = index; |
2138 |
|
if (indexPtr) |
2139 |
|
*indexPtr = index; |
2140 |
|
return entry; |
2141 |
|
} |
2142 |
} |
} |
2143 |
} |
} |
2144 |
} else if (cfg->defaultImage > -1) { |
} else if (cfg->defaultImage > -1) { |
2383 |
} else { |
} else { |
2384 |
char * title; |
char * title; |
2385 |
line = getLineByType(LT_MENUENTRY, entry->lines); |
line = getLineByType(LT_MENUENTRY, entry->lines); |
2386 |
title = grub2ExtractTitle(line); |
if (line) { |
2387 |
if (title) |
title = grub2ExtractTitle(line); |
2388 |
printf("title=%s\n", title); |
if (title) |
2389 |
|
printf("title=%s\n", title); |
2390 |
|
} |
2391 |
} |
} |
2392 |
|
|
2393 |
for (j = 0, line = entry->lines; line; line = line->next) { |
for (j = 0, line = entry->lines; line; line = line->next) { |
3324 |
} |
} |
3325 |
|
|
3326 |
int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel, |
int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel, |
3327 |
const char * image, const char * prefix, const char * initrd) { |
const char * image, const char * prefix, const char * initrd, |
3328 |
|
const char * title) { |
3329 |
struct singleEntry * entry; |
struct singleEntry * entry; |
3330 |
struct singleLine * line, * kernelLine, *endLine = NULL; |
struct singleLine * line, * kernelLine, *endLine = NULL; |
3331 |
int index = 0; |
int index = 0; |
3332 |
|
|
3333 |
if (!image) return 0; |
if (!image) return 0; |
3334 |
|
|
3335 |
for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) { |
for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) { |
3336 |
kernelLine = getLineByType(LT_MBMODULE, entry->lines); |
kernelLine = getLineByType(LT_MBMODULE, entry->lines); |
3337 |
if (!kernelLine) continue; |
if (!kernelLine) continue; |
3338 |
|
|
3339 |
|
/* if title is supplied, the entry's title must match it. */ |
3340 |
|
if (title) { |
3341 |
|
char *linetitle; |
3342 |
|
|
3343 |
|
line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines); |
3344 |
|
if (!line) |
3345 |
|
continue; |
3346 |
|
|
3347 |
|
linetitle = extractTitle(cfg, line); |
3348 |
|
if (!linetitle) |
3349 |
|
continue; |
3350 |
|
if (strcmp(title, linetitle)) { |
3351 |
|
free(linetitle); |
3352 |
|
continue; |
3353 |
|
} |
3354 |
|
free(linetitle); |
3355 |
|
} |
3356 |
|
|
3357 |
if (prefix) { |
if (prefix) { |
3358 |
int prefixLen = strlen(prefix); |
int prefixLen = strlen(prefix); |
3359 |
if (!strncmp(initrd, prefix, prefixLen)) |
if (!strncmp(initrd, prefix, prefixLen)) |
3379 |
} |
} |
3380 |
|
|
3381 |
int updateInitrd(struct grubConfig * cfg, const char * image, |
int updateInitrd(struct grubConfig * cfg, const char * image, |
3382 |
const char * prefix, const char * initrd) { |
const char * prefix, const char * initrd, const char * title) { |
3383 |
struct singleEntry * entry; |
struct singleEntry * entry; |
3384 |
struct singleLine * line, * kernelLine, *endLine = NULL; |
struct singleLine * line, * kernelLine, *endLine = NULL; |
3385 |
int index = 0; |
int index = 0; |
3390 |
kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines); |
kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines); |
3391 |
if (!kernelLine) continue; |
if (!kernelLine) continue; |
3392 |
|
|
3393 |
|
/* if title is supplied, the entry's title must match it. */ |
3394 |
|
if (title) { |
3395 |
|
char *linetitle; |
3396 |
|
|
3397 |
|
line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines); |
3398 |
|
if (!line) |
3399 |
|
continue; |
3400 |
|
|
3401 |
|
linetitle = extractTitle(cfg, line); |
3402 |
|
if (!linetitle) |
3403 |
|
continue; |
3404 |
|
if (strcmp(title, linetitle)) { |
3405 |
|
free(linetitle); |
3406 |
|
continue; |
3407 |
|
} |
3408 |
|
free(linetitle); |
3409 |
|
} |
3410 |
|
|
3411 |
line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines); |
line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines); |
3412 |
if (line) |
if (line) |
3413 |
removeLine(entry, line); |
removeLine(entry, line); |
4282 |
_("display the title of the default kernel") }, |
_("display the title of the default kernel") }, |
4283 |
{ "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0, |
{ "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0, |
4284 |
_("device tree file for new stanza"), _("dtb-path") }, |
_("device tree file for new stanza"), _("dtb-path") }, |
4285 |
|
{ "devtreedir", 0, POPT_ARG_STRING, &newDevTreePath, 0, |
4286 |
|
_("device tree directory for new stanza"), _("dtb-path") }, |
4287 |
{ "elilo", 0, POPT_ARG_NONE, &configureELilo, 0, |
{ "elilo", 0, POPT_ARG_NONE, &configureELilo, 0, |
4288 |
_("configure elilo bootloader") }, |
_("configure elilo bootloader") }, |
4289 |
{ "efi", 0, POPT_ARG_NONE, &isEfi, 0, |
{ "efi", 0, POPT_ARG_NONE, &isEfi, 0, |
4468 |
if (newKernelPath && !newKernelTitle) { |
if (newKernelPath && !newKernelTitle) { |
4469 |
fprintf(stderr, _("grubby: kernel title must be specified\n")); |
fprintf(stderr, _("grubby: kernel title must be specified\n")); |
4470 |
return 1; |
return 1; |
4471 |
} else if (!newKernelPath && (newKernelTitle || copyDefault || |
} else if (!newKernelPath && (copyDefault || |
4472 |
(newKernelInitrd && !updateKernelPath)|| |
(newKernelInitrd && !updateKernelPath)|| |
4473 |
makeDefault || extraInitrdCount > 0)) { |
makeDefault || extraInitrdCount > 0)) { |
4474 |
fprintf(stderr, _("grubby: kernel path expected\n")); |
fprintf(stderr, _("grubby: kernel path expected\n")); |
4690 |
if (updateKernelPath && newKernelInitrd) { |
if (updateKernelPath && newKernelInitrd) { |
4691 |
if (newMBKernel) { |
if (newMBKernel) { |
4692 |
if (addMBInitrd(config, newMBKernel, updateKernelPath, |
if (addMBInitrd(config, newMBKernel, updateKernelPath, |
4693 |
bootPrefix, newKernelInitrd)) |
bootPrefix, newKernelInitrd, |
4694 |
|
newKernelTitle)) |
4695 |
return 1; |
return 1; |
4696 |
} else { |
} else { |
4697 |
if (updateInitrd(config, updateKernelPath, bootPrefix, |
if (updateInitrd(config, updateKernelPath, bootPrefix, |
4698 |
newKernelInitrd)) |
newKernelInitrd, newKernelTitle)) |
4699 |
return 1; |
return 1; |
4700 |
} |
} |
4701 |
} |
} |