90 |
LT_SET_VARIABLE = 1 << 19, |
LT_SET_VARIABLE = 1 << 19, |
91 |
LT_KERNEL_EFI = 1 << 20, |
LT_KERNEL_EFI = 1 << 20, |
92 |
LT_INITRD_EFI = 1 << 21, |
LT_INITRD_EFI = 1 << 21, |
93 |
LT_UNKNOWN = 1 << 22, |
LT_KERNEL_16 = 1 << 22, |
94 |
|
LT_INITRD_16 = 1 << 23, |
95 |
|
LT_UNKNOWN = 1 << 24, |
96 |
}; |
}; |
97 |
|
|
98 |
struct singleLine { |
struct singleLine { |
138 |
typedef const char *(*findConfigFunc)(struct configFileInfo *); |
typedef const char *(*findConfigFunc)(struct configFileInfo *); |
139 |
typedef const int (*writeLineFunc)(struct configFileInfo *, |
typedef const int (*writeLineFunc)(struct configFileInfo *, |
140 |
struct singleLine *line); |
struct singleLine *line); |
141 |
|
typedef char *(*getEnvFunc)(struct configFileInfo *, char *name); |
142 |
|
typedef int (*setEnvFunc)(struct configFileInfo *, char *name, char *value); |
143 |
|
|
144 |
struct configFileInfo { |
struct configFileInfo { |
145 |
char * defaultConfig; |
char * defaultConfig; |
146 |
findConfigFunc findConfig; |
findConfigFunc findConfig; |
147 |
writeLineFunc writeLine; |
writeLineFunc writeLine; |
148 |
|
getEnvFunc getEnv; |
149 |
|
setEnvFunc setEnv; |
150 |
struct keywordTypes * keywords; |
struct keywordTypes * keywords; |
151 |
int caseInsensitive; |
int caseInsensitive; |
152 |
int defaultIsIndex; |
int defaultIsIndex; |
153 |
int defaultIsVariable; |
int defaultIsVariable; |
154 |
int defaultSupportSaved; |
int defaultSupportSaved; |
155 |
|
int defaultIsSaved; |
156 |
enum lineType_e entryStart; |
enum lineType_e entryStart; |
157 |
enum lineType_e entryEnd; |
enum lineType_e entryEnd; |
158 |
int needsBootPrefix; |
int needsBootPrefix; |
164 |
int mbInitRdIsModule; |
int mbInitRdIsModule; |
165 |
int mbConcatArgs; |
int mbConcatArgs; |
166 |
int mbAllowExtraInitRds; |
int mbAllowExtraInitRds; |
167 |
|
char *envFile; |
168 |
}; |
}; |
169 |
|
|
170 |
struct keywordTypes grubKeywords[] = { |
struct keywordTypes grubKeywords[] = { |
184 |
"/boot/grub/grub.conf", |
"/boot/grub/grub.conf", |
185 |
"/boot/grub/menu.lst", |
"/boot/grub/menu.lst", |
186 |
"/etc/grub.conf", |
"/etc/grub.conf", |
187 |
|
"/boot/grub2/grub.cfg", |
188 |
|
"/boot/grub2-efi/grub.cfg", |
189 |
NULL |
NULL |
190 |
}; |
}; |
191 |
static int i = -1; |
static int i = -1; |
225 |
{ "fallback", LT_FALLBACK, ' ' }, |
{ "fallback", LT_FALLBACK, ' ' }, |
226 |
{ "linux", LT_KERNEL, ' ' }, |
{ "linux", LT_KERNEL, ' ' }, |
227 |
{ "linuxefi", LT_KERNEL_EFI, ' ' }, |
{ "linuxefi", LT_KERNEL_EFI, ' ' }, |
228 |
|
{ "linux16", LT_KERNEL_16, ' ' }, |
229 |
{ "initrd", LT_INITRD, ' ', ' ' }, |
{ "initrd", LT_INITRD, ' ', ' ' }, |
230 |
{ "initrdefi", LT_INITRD_EFI, ' ', ' ' }, |
{ "initrdefi", LT_INITRD_EFI, ' ', ' ' }, |
231 |
|
{ "initrd16", LT_INITRD_16, ' ', ' ' }, |
232 |
{ "module", LT_MBMODULE, ' ' }, |
{ "module", LT_MBMODULE, ' ' }, |
233 |
{ "kernel", LT_HYPER, ' ' }, |
{ "kernel", LT_HYPER, ' ' }, |
234 |
{ NULL, 0, 0 }, |
{ NULL, 0, 0 }, |
273 |
return configFiles[i]; |
return configFiles[i]; |
274 |
} |
} |
275 |
|
|
276 |
|
/* kind of hacky. It'll give the first 1024 bytes, ish. */ |
277 |
|
static char *grub2GetEnv(struct configFileInfo *info, char *name) |
278 |
|
{ |
279 |
|
static char buf[1025]; |
280 |
|
char *s = NULL; |
281 |
|
char *ret = NULL; |
282 |
|
char *envFile = info->envFile ? info->envFile : "/boot/grub/grubenv"; |
283 |
|
int rc = asprintf(&s, "grub-editenv %s list | grep '^%s='", envFile, name); |
284 |
|
|
285 |
|
if (rc < 0) |
286 |
|
return NULL; |
287 |
|
|
288 |
|
FILE *f = popen(s, "r"); |
289 |
|
if (!f) |
290 |
|
goto out; |
291 |
|
|
292 |
|
memset(buf, '\0', sizeof (buf)); |
293 |
|
ret = fgets(buf, 1024, f); |
294 |
|
pclose(f); |
295 |
|
|
296 |
|
if (ret) { |
297 |
|
ret += strlen(name) + 1; |
298 |
|
ret[strlen(ret) - 1] = '\0'; |
299 |
|
} |
300 |
|
dbgPrintf("grub2GetEnv(%s): %s\n", name, ret); |
301 |
|
out: |
302 |
|
free(s); |
303 |
|
return ret; |
304 |
|
} |
305 |
|
|
306 |
|
static int sPopCount(const char *s, const char *c) |
307 |
|
{ |
308 |
|
int ret = 0; |
309 |
|
if (!s) |
310 |
|
return -1; |
311 |
|
for (int i = 0; s[i] != '\0'; i++) |
312 |
|
for (int j = 0; c[j] != '\0'; j++) |
313 |
|
if (s[i] == c[j]) |
314 |
|
ret++; |
315 |
|
return ret; |
316 |
|
} |
317 |
|
|
318 |
|
static char *shellEscape(const char *s) |
319 |
|
{ |
320 |
|
int l = strlen(s) + sPopCount(s, "'") * 2; |
321 |
|
|
322 |
|
char *ret = calloc(l+1, sizeof (*ret)); |
323 |
|
if (!ret) |
324 |
|
return NULL; |
325 |
|
for (int i = 0, j = 0; s[i] != '\0'; i++, j++) { |
326 |
|
if (s[i] == '\'') |
327 |
|
ret[j++] = '\\'; |
328 |
|
ret[j] = s[i]; |
329 |
|
} |
330 |
|
return ret; |
331 |
|
} |
332 |
|
|
333 |
|
static void unquote(char *s) |
334 |
|
{ |
335 |
|
int l = strlen(s); |
336 |
|
|
337 |
|
if ((s[l-1] == '\'' && s[0] == '\'') || (s[l-1] == '"' && s[0] == '"')) { |
338 |
|
memmove(s, s+1, l-2); |
339 |
|
s[l-2] = '\0'; |
340 |
|
} |
341 |
|
} |
342 |
|
|
343 |
|
static int grub2SetEnv(struct configFileInfo *info, char *name, char *value) |
344 |
|
{ |
345 |
|
char *s = NULL; |
346 |
|
int rc = 0; |
347 |
|
char *envFile = info->envFile ? info->envFile : "/boot/grub/grubenv"; |
348 |
|
|
349 |
|
unquote(value); |
350 |
|
value = shellEscape(value); |
351 |
|
if (!value) |
352 |
|
return -1; |
353 |
|
|
354 |
|
rc = asprintf(&s, "grub-editenv %s set '%s=%s'", envFile, name, value); |
355 |
|
free(value); |
356 |
|
if (rc <0) |
357 |
|
return -1; |
358 |
|
|
359 |
|
dbgPrintf("grub2SetEnv(%s): %s\n", name, s); |
360 |
|
rc = system(s); |
361 |
|
free(s); |
362 |
|
return rc; |
363 |
|
} |
364 |
|
|
365 |
|
/* this is a gigantic hack to avoid clobbering grub2 variables... */ |
366 |
|
static int is_special_grub2_variable(const char *name) |
367 |
|
{ |
368 |
|
if (!strcmp(name,"\"${next_entry}\"")) |
369 |
|
return 1; |
370 |
|
if (!strcmp(name,"\"${prev_saved_entry}\"")) |
371 |
|
return 1; |
372 |
|
return 0; |
373 |
|
} |
374 |
|
|
375 |
int sizeOfSingleLine(struct singleLine * line) { |
int sizeOfSingleLine(struct singleLine * line) { |
376 |
int count = 0; |
int count = 0; |
377 |
|
|
402 |
} |
} |
403 |
|
|
404 |
static int iskernel(enum lineType_e type) { |
static int iskernel(enum lineType_e type) { |
405 |
return (type == LT_KERNEL || type == LT_KERNEL_EFI); |
return (type == LT_KERNEL || type == LT_KERNEL_EFI || type == LT_KERNEL_16); |
406 |
} |
} |
407 |
|
|
408 |
static int isinitrd(enum lineType_e type) { |
static int isinitrd(enum lineType_e type) { |
409 |
return (type == LT_INITRD || type == LT_INITRD_EFI); |
return (type == LT_INITRD || type == LT_INITRD_EFI || type == LT_INITRD_16); |
410 |
} |
} |
411 |
|
|
412 |
char *grub2ExtractTitle(struct singleLine * line) { |
char *grub2ExtractTitle(struct singleLine * line) { |
466 |
|
|
467 |
struct configFileInfo grub2ConfigType = { |
struct configFileInfo grub2ConfigType = { |
468 |
.findConfig = grub2FindConfig, |
.findConfig = grub2FindConfig, |
469 |
|
.getEnv = grub2GetEnv, |
470 |
|
.setEnv = grub2SetEnv, |
471 |
.keywords = grub2Keywords, |
.keywords = grub2Keywords, |
472 |
.defaultIsIndex = 1, |
.defaultIsIndex = 1, |
473 |
.defaultSupportSaved = 1, |
.defaultSupportSaved = 1, |
647 |
struct singleEntry * findEntryByPath(struct grubConfig * cfg, |
struct singleEntry * findEntryByPath(struct grubConfig * cfg, |
648 |
const char * path, const char * prefix, |
const char * path, const char * prefix, |
649 |
int * index); |
int * index); |
650 |
|
struct singleEntry * findEntryByTitle(struct grubConfig * cfg, char *title, |
651 |
|
int * index); |
652 |
static int readFile(int fd, char ** bufPtr); |
static int readFile(int fd, char ** bufPtr); |
653 |
static void lineInit(struct singleLine * line); |
static void lineInit(struct singleLine * line); |
654 |
struct singleLine * lineDup(struct singleLine * line); |
struct singleLine * lineDup(struct singleLine * line); |
724 |
default: |
default: |
725 |
return type; |
return type; |
726 |
} |
} |
727 |
|
#if defined(__i386__) || defined(__x86_64__) |
728 |
|
} else if (cfi == &grub2ConfigType) { |
729 |
|
switch (type) { |
730 |
|
case LT_KERNEL: |
731 |
|
return LT_KERNEL_16; |
732 |
|
case LT_INITRD: |
733 |
|
return LT_INITRD_16; |
734 |
|
default: |
735 |
|
return type; |
736 |
|
} |
737 |
|
#endif |
738 |
} |
} |
739 |
return type; |
return type; |
740 |
} |
} |
817 |
/* extract the title from within brackets (for zipl) */ |
/* extract the title from within brackets (for zipl) */ |
818 |
static char * extractTitle(struct singleLine * line) { |
static char * extractTitle(struct singleLine * line) { |
819 |
/* bracketed title... let's extract it (leaks a byte) */ |
/* bracketed title... let's extract it (leaks a byte) */ |
820 |
char * title; |
char * title = NULL; |
821 |
title = strdup(line->elements[0].item); |
if (line->type == LT_TITLE) { |
822 |
title++; |
title = strdup(line->elements[0].item); |
823 |
*(title + strlen(title) - 1) = '\0'; |
title++; |
824 |
|
*(title + strlen(title) - 1) = '\0'; |
825 |
|
} else if (line->type == LT_MENUENTRY) |
826 |
|
title = strdup(line->elements[1].item); |
827 |
|
else |
828 |
|
return NULL; |
829 |
return title; |
return title; |
830 |
} |
} |
831 |
|
|
1083 |
return 0; |
return 0; |
1084 |
} |
} |
1085 |
|
|
1086 |
|
static int isnumber(const char *s) |
1087 |
|
{ |
1088 |
|
int i; |
1089 |
|
for (i = 0; s[i] != '\0'; i++) |
1090 |
|
if (s[i] < '0' || s[i] > '9') |
1091 |
|
return 0; |
1092 |
|
return i; |
1093 |
|
} |
1094 |
|
|
1095 |
static struct grubConfig * readConfig(const char * inName, |
static struct grubConfig * readConfig(const char * inName, |
1096 |
struct configFileInfo * cfi) { |
struct configFileInfo * cfi) { |
1097 |
int in; |
int in; |
1176 |
dbgPrintf("\n"); |
dbgPrintf("\n"); |
1177 |
struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi); |
struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi); |
1178 |
if (kwType && line->numElements == 3 && |
if (kwType && line->numElements == 3 && |
1179 |
!strcmp(line->elements[1].item, kwType->key)) { |
!strcmp(line->elements[1].item, kwType->key) && |
1180 |
|
!is_special_grub2_variable(line->elements[2].item)) { |
1181 |
dbgPrintf("Line sets default config\n"); |
dbgPrintf("Line sets default config\n"); |
1182 |
cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT; |
cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT; |
1183 |
defaultLine = line; |
defaultLine = line; |
1382 |
if (defaultLine->numElements > 2 && |
if (defaultLine->numElements > 2 && |
1383 |
cfi->defaultSupportSaved && |
cfi->defaultSupportSaved && |
1384 |
!strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) { |
!strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) { |
1385 |
cfg->defaultImage = DEFAULT_SAVED_GRUB2; |
cfg->cfi->defaultIsSaved = 1; |
1386 |
|
cfg->defaultImage = DEFAULT_SAVED_GRUB2; |
1387 |
|
if (cfg->cfi->getEnv) { |
1388 |
|
char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry"); |
1389 |
|
if (defTitle) { |
1390 |
|
int index = 0; |
1391 |
|
if (isnumber(defTitle)) { |
1392 |
|
index = atoi(defTitle); |
1393 |
|
entry = findEntryByIndex(cfg, index); |
1394 |
|
} else { |
1395 |
|
entry = findEntryByTitle(cfg, defTitle, &index); |
1396 |
|
} |
1397 |
|
if (entry) |
1398 |
|
cfg->defaultImage = index; |
1399 |
|
} |
1400 |
|
} |
1401 |
} else if (cfi->defaultIsVariable) { |
} else if (cfi->defaultIsVariable) { |
1402 |
char *value = defaultLine->elements[2].item; |
char *value = defaultLine->elements[2].item; |
1403 |
while (*value && (*value == '"' || *value == '\'' || |
while (*value && (*value == '"' || *value == '\'' || |
1438 |
cfg->defaultImage = -1; |
cfg->defaultImage = -1; |
1439 |
} |
} |
1440 |
} |
} |
1441 |
|
} else if (cfg->cfi->defaultIsSaved && cfg->cfi->getEnv) { |
1442 |
|
char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry"); |
1443 |
|
if (defTitle) { |
1444 |
|
int index = 0; |
1445 |
|
if (isnumber(defTitle)) { |
1446 |
|
index = atoi(defTitle); |
1447 |
|
entry = findEntryByIndex(cfg, index); |
1448 |
|
} else { |
1449 |
|
entry = findEntryByTitle(cfg, defTitle, &index); |
1450 |
|
} |
1451 |
|
if (entry) |
1452 |
|
cfg->defaultImage = index; |
1453 |
|
} |
1454 |
} else { |
} else { |
1455 |
cfg->defaultImage = 0; |
cfg->defaultImage = 0; |
1456 |
} |
} |
1468 |
|
|
1469 |
if (cfg->defaultImage == DEFAULT_SAVED) |
if (cfg->defaultImage == DEFAULT_SAVED) |
1470 |
fprintf(out, "%sdefault%ssaved\n", indent, separator); |
fprintf(out, "%sdefault%ssaved\n", indent, separator); |
1471 |
else if (cfg->defaultImage == DEFAULT_SAVED_GRUB2) |
else if (cfg->cfi->defaultIsSaved) { |
1472 |
fprintf(out, "%sset default=\"${saved_entry}\"\n", indent); |
fprintf(out, "%sset default=\"${saved_entry}\"\n", indent); |
1473 |
else if (cfg->defaultImage > -1) { |
if (cfg->defaultImage >= 0 && cfg->cfi->setEnv) { |
1474 |
|
char *title; |
1475 |
|
entry = findEntryByIndex(cfg, cfg->defaultImage); |
1476 |
|
line = getLineByType(LT_MENUENTRY, entry->lines); |
1477 |
|
if (!line) |
1478 |
|
line = getLineByType(LT_TITLE, entry->lines); |
1479 |
|
if (line) { |
1480 |
|
title = extractTitle(line); |
1481 |
|
if (title) |
1482 |
|
cfg->cfi->setEnv(cfg->cfi, "saved_entry", title); |
1483 |
|
} |
1484 |
|
} |
1485 |
|
} else if (cfg->defaultImage > -1) { |
1486 |
if (cfg->cfi->defaultIsIndex) { |
if (cfg->cfi->defaultIsIndex) { |
1487 |
if (cfg->cfi->defaultIsVariable) { |
if (cfg->cfi->defaultIsVariable) { |
1488 |
fprintf(out, "%sset default=\"%d\"\n", indent, |
fprintf(out, "%sset default=\"%d\"\n", indent, |
1585 |
while (line) { |
while (line) { |
1586 |
if (line->type == LT_SET_VARIABLE && defaultKw && |
if (line->type == LT_SET_VARIABLE && defaultKw && |
1587 |
line->numElements == 3 && |
line->numElements == 3 && |
1588 |
!strcmp(line->elements[1].item, defaultKw->key)) { |
!strcmp(line->elements[1].item, defaultKw->key) && |
1589 |
|
!is_special_grub2_variable(line->elements[2].item)) { |
1590 |
writeDefault(out, line->indent, line->elements[0].indent, cfg); |
writeDefault(out, line->indent, line->elements[0].indent, cfg); |
1591 |
needs &= ~MAIN_DEFAULT; |
needs &= ~MAIN_DEFAULT; |
1592 |
} else if (line->type == LT_DEFAULT) { |
} else if (line->type == LT_DEFAULT) { |
1822 |
return 0; |
return 0; |
1823 |
} |
} |
1824 |
|
|
1825 |
line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines); |
line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines); |
1826 |
if (!line) { |
if (!line) { |
1827 |
notSuitablePrintf(entry, 0, "no line found\n"); |
notSuitablePrintf(entry, 0, "no line found\n"); |
1828 |
return 0; |
return 0; |
1956 |
entry = findEntryByIndex(config, indexVars[i]); |
entry = findEntryByIndex(config, indexVars[i]); |
1957 |
if (!entry) return NULL; |
if (!entry) return NULL; |
1958 |
|
|
1959 |
line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines); |
line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines); |
1960 |
if (!line) return NULL; |
if (!line) return NULL; |
1961 |
|
|
1962 |
if (index) *index = indexVars[i]; |
if (index) *index = indexVars[i]; |
2007 |
for (line = entry->lines; line; line = line->next) { |
for (line = entry->lines; line; line = line->next) { |
2008 |
enum lineType_e ct = checkType; |
enum lineType_e ct = checkType; |
2009 |
if (entry->multiboot && checkType == LT_KERNEL) |
if (entry->multiboot && checkType == LT_KERNEL) |
2010 |
ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER; |
ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER|LT_KERNEL_16; |
2011 |
else if (checkType & LT_KERNEL) |
else if (checkType & LT_KERNEL) |
2012 |
ct = checkType | LT_KERNEL_EFI; |
ct = checkType | LT_KERNEL_EFI | LT_KERNEL_16; |
2013 |
line = getLineByType(ct, line); |
line = getLineByType(ct, line); |
2014 |
if (!line) |
if (!line) |
2015 |
break; /* not found in this entry */ |
break; /* not found in this entry */ |
2031 |
* non-Linux boot entries (could find netbsd etc, though, which is |
* non-Linux boot entries (could find netbsd etc, though, which is |
2032 |
* unfortunate) |
* unfortunate) |
2033 |
*/ |
*/ |
2034 |
if (line && getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines)) |
if (line && getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines)) |
2035 |
break; /* found 'im! */ |
break; /* found 'im! */ |
2036 |
} |
} |
2037 |
|
|
2041 |
return entry; |
return entry; |
2042 |
} |
} |
2043 |
|
|
2044 |
|
struct singleEntry * findEntryByTitle(struct grubConfig * cfg, char *title, |
2045 |
|
int * index) { |
2046 |
|
struct singleEntry * entry; |
2047 |
|
struct singleLine * line; |
2048 |
|
int i; |
2049 |
|
char * newtitle; |
2050 |
|
|
2051 |
|
for (i = 0, entry = cfg->entries; entry; entry = entry->next, i++) { |
2052 |
|
if (index && i < *index) |
2053 |
|
continue; |
2054 |
|
line = getLineByType(LT_TITLE, entry->lines); |
2055 |
|
if (!line) |
2056 |
|
line = getLineByType(LT_MENUENTRY, entry->lines); |
2057 |
|
if (!line) |
2058 |
|
continue; |
2059 |
|
newtitle = grub2ExtractTitle(line); |
2060 |
|
if (!newtitle) |
2061 |
|
continue; |
2062 |
|
if (!strcmp(title, newtitle)) |
2063 |
|
break; |
2064 |
|
} |
2065 |
|
|
2066 |
|
if (!entry) |
2067 |
|
return NULL; |
2068 |
|
|
2069 |
|
if (index) |
2070 |
|
*index = i; |
2071 |
|
return entry; |
2072 |
|
} |
2073 |
|
|
2074 |
struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index) { |
struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index) { |
2075 |
struct singleEntry * entry; |
struct singleEntry * entry; |
2076 |
|
|
2093 |
struct singleEntry * entry, * entry2; |
struct singleEntry * entry, * entry2; |
2094 |
int index; |
int index; |
2095 |
|
|
2096 |
if (cfg->defaultImage > -1) { |
if (cfg->cfi->defaultIsSaved) { |
2097 |
|
if (cfg->cfi->getEnv) { |
2098 |
|
char *defTitle = cfg->cfi->getEnv(cfg->cfi, "saved_entry"); |
2099 |
|
if (defTitle) { |
2100 |
|
int index = 0; |
2101 |
|
if (isnumber(defTitle)) { |
2102 |
|
index = atoi(defTitle); |
2103 |
|
entry = findEntryByIndex(cfg, index); |
2104 |
|
} else { |
2105 |
|
entry = findEntryByTitle(cfg, defTitle, &index); |
2106 |
|
} |
2107 |
|
if (entry) |
2108 |
|
cfg->defaultImage = index; |
2109 |
|
} |
2110 |
|
} |
2111 |
|
} else if (cfg->defaultImage > -1) { |
2112 |
entry = findEntryByIndex(cfg, cfg->defaultImage); |
entry = findEntryByIndex(cfg, cfg->defaultImage); |
2113 |
if (entry && suitableImage(entry, prefix, skipRemoved, flags)) { |
if (entry && suitableImage(entry, prefix, skipRemoved, flags)) { |
2114 |
if (indexPtr) *indexPtr = cfg->defaultImage; |
if (indexPtr) *indexPtr = cfg->defaultImage; |
2265 |
|
|
2266 |
printf("index=%d\n", index); |
printf("index=%d\n", index); |
2267 |
|
|
2268 |
line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines); |
line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines); |
2269 |
if (!line) { |
if (!line) { |
2270 |
printf("non linux entry\n"); |
printf("non linux entry\n"); |
2271 |
return; |
return; |
2330 |
printf("root=%s\n", s); |
printf("root=%s\n", s); |
2331 |
} |
} |
2332 |
|
|
2333 |
line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines); |
line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines); |
2334 |
|
|
2335 |
if (line && line->numElements >= 2) { |
if (line && line->numElements >= 2) { |
2336 |
if (!strncmp(prefix, line->elements[1].item, strlen(prefix))) |
if (!strncmp(prefix, line->elements[1].item, strlen(prefix))) |
2747 |
insertElement(newLine, val, 1, cfi); |
insertElement(newLine, val, 1, cfi); |
2748 |
|
|
2749 |
/* but try to keep the rootspec from the template... sigh */ |
/* but try to keep the rootspec from the template... sigh */ |
2750 |
if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD|LT_KERNEL_EFI|LT_INITRD_EFI)) { |
if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD|LT_KERNEL_EFI|LT_INITRD_EFI|LT_KERNEL_16|LT_INITRD_16)) { |
2751 |
char * rootspec = getRootSpecifier(tmplLine->elements[1].item); |
char * rootspec = getRootSpecifier(tmplLine->elements[1].item); |
2752 |
if (rootspec != NULL) { |
if (rootspec != NULL) { |
2753 |
free(newLine->elements[1].item); |
free(newLine->elements[1].item); |
3117 |
firstElement = 2; |
firstElement = 2; |
3118 |
|
|
3119 |
} else { |
} else { |
3120 |
line = getLineByType(LT_KERNEL|LT_MBMODULE|LT_KERNEL_EFI, entry->lines); |
line = getLineByType(LT_KERNEL|LT_MBMODULE|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines); |
3121 |
if (!line) { |
if (!line) { |
3122 |
/* no LT_KERNEL or LT_MBMODULE in this entry? */ |
/* no LT_KERNEL or LT_MBMODULE in this entry? */ |
3123 |
continue; |
continue; |
3273 |
return rc; |
return rc; |
3274 |
} |
} |
3275 |
|
|
3276 |
|
int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel, |
3277 |
|
const char * image, const char * prefix, const char * initrd) { |
3278 |
|
struct singleEntry * entry; |
3279 |
|
struct singleLine * line, * kernelLine, *endLine = NULL; |
3280 |
|
int index = 0; |
3281 |
|
|
3282 |
|
if (!image) return 0; |
3283 |
|
|
3284 |
|
for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) { |
3285 |
|
kernelLine = getLineByType(LT_MBMODULE, entry->lines); |
3286 |
|
if (!kernelLine) continue; |
3287 |
|
|
3288 |
|
if (prefix) { |
3289 |
|
int prefixLen = strlen(prefix); |
3290 |
|
if (!strncmp(initrd, prefix, prefixLen)) |
3291 |
|
initrd += prefixLen; |
3292 |
|
} |
3293 |
|
endLine = getLineByType(LT_ENTRY_END, entry->lines); |
3294 |
|
if (endLine) |
3295 |
|
removeLine(entry, endLine); |
3296 |
|
line = addLine(entry, cfg->cfi, preferredLineType(LT_MBMODULE,cfg->cfi), |
3297 |
|
kernelLine->indent, initrd); |
3298 |
|
if (!line) |
3299 |
|
return 1; |
3300 |
|
if (endLine) { |
3301 |
|
line = addLine(entry, cfg->cfi, LT_ENTRY_END, "", NULL); |
3302 |
|
if (!line) |
3303 |
|
return 1; |
3304 |
|
} |
3305 |
|
|
3306 |
|
break; |
3307 |
|
} |
3308 |
|
|
3309 |
|
return 0; |
3310 |
|
} |
3311 |
|
|
3312 |
int updateInitrd(struct grubConfig * cfg, const char * image, |
int updateInitrd(struct grubConfig * cfg, const char * image, |
3313 |
const char * prefix, const char * initrd) { |
const char * prefix, const char * initrd) { |
3314 |
struct singleEntry * entry; |
struct singleEntry * entry; |
3318 |
if (!image) return 0; |
if (!image) return 0; |
3319 |
|
|
3320 |
for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) { |
for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) { |
3321 |
kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI, entry->lines); |
kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines); |
3322 |
if (!kernelLine) continue; |
if (!kernelLine) continue; |
3323 |
|
|
3324 |
line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines); |
line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines); |
3325 |
if (line) |
if (line) |
3326 |
removeLine(entry, line); |
removeLine(entry, line); |
3327 |
if (prefix) { |
if (prefix) { |
3332 |
endLine = getLineByType(LT_ENTRY_END, entry->lines); |
endLine = getLineByType(LT_ENTRY_END, entry->lines); |
3333 |
if (endLine) |
if (endLine) |
3334 |
removeLine(entry, endLine); |
removeLine(entry, endLine); |
3335 |
line = addLine(entry, cfg->cfi, preferredLineType(LT_INITRD, cfg->cfi), |
enum lineType_e lt; |
3336 |
kernelLine->indent, initrd); |
switch(kernelLine->type) { |
3337 |
|
case LT_KERNEL: |
3338 |
|
lt = LT_INITRD; |
3339 |
|
break; |
3340 |
|
case LT_KERNEL_EFI: |
3341 |
|
lt = LT_INITRD_EFI; |
3342 |
|
break; |
3343 |
|
case LT_KERNEL_16: |
3344 |
|
lt = LT_INITRD_16; |
3345 |
|
break; |
3346 |
|
default: |
3347 |
|
lt = preferredLineType(LT_INITRD, cfg->cfi); |
3348 |
|
} |
3349 |
|
line = addLine(entry, cfg->cfi, lt, kernelLine->indent, initrd); |
3350 |
if (!line) |
if (!line) |
3351 |
return 1; |
return 1; |
3352 |
if (endLine) { |
if (endLine) { |
3944 |
switch (config->cfi->entryStart) { |
switch (config->cfi->entryStart) { |
3945 |
case LT_KERNEL: |
case LT_KERNEL: |
3946 |
case LT_KERNEL_EFI: |
case LT_KERNEL_EFI: |
3947 |
|
case LT_KERNEL_16: |
3948 |
if (new->multiboot && config->cfi->mbHyperFirst) { |
if (new->multiboot && config->cfi->mbHyperFirst) { |
3949 |
/* fall through to LT_HYPER */ |
/* fall through to LT_HYPER */ |
3950 |
} else { |
} else { |
4112 |
char * removeArgs = NULL; |
char * removeArgs = NULL; |
4113 |
char * kernelInfo = NULL; |
char * kernelInfo = NULL; |
4114 |
char * extraInitrds[MAX_EXTRA_INITRDS] = { NULL }; |
char * extraInitrds[MAX_EXTRA_INITRDS] = { NULL }; |
4115 |
|
char * envPath = NULL; |
4116 |
const char * chptr = NULL; |
const char * chptr = NULL; |
4117 |
struct configFileInfo * cfi = NULL; |
struct configFileInfo * cfi = NULL; |
4118 |
struct grubConfig * config; |
struct grubConfig * config; |
4164 |
_("configure elilo bootloader") }, |
_("configure elilo bootloader") }, |
4165 |
{ "efi", 0, POPT_ARG_NONE, &isEfi, 0, |
{ "efi", 0, POPT_ARG_NONE, &isEfi, 0, |
4166 |
_("force grub2 stanzas to use efi") }, |
_("force grub2 stanzas to use efi") }, |
4167 |
|
{ "env", 0, POPT_ARG_STRING, &envPath, 0, |
4168 |
|
_("path for environment data"), |
4169 |
|
_("path") }, |
4170 |
{ "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0, |
{ "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0, |
4171 |
_("configure extlinux bootloader (from syslinux)") }, |
_("configure extlinux bootloader (from syslinux)") }, |
4172 |
{ "grub", 0, POPT_ARG_NONE, &configureGrub, 0, |
{ "grub", 0, POPT_ARG_NONE, &configureGrub, 0, |
4280 |
return 1; |
return 1; |
4281 |
} else if (configureGrub2) { |
} else if (configureGrub2) { |
4282 |
cfi = &grub2ConfigType; |
cfi = &grub2ConfigType; |
4283 |
|
if (envPath) |
4284 |
|
cfi->envFile = envPath; |
4285 |
} else if (configureLilo) { |
} else if (configureLilo) { |
4286 |
cfi = &liloConfigType; |
cfi = &liloConfigType; |
4287 |
} else if (configureGrub) { |
} else if (configureGrub) { |
4496 |
char * rootspec; |
char * rootspec; |
4497 |
|
|
4498 |
if (config->defaultImage == -1) return 0; |
if (config->defaultImage == -1) return 0; |
4499 |
|
if (config->defaultImage == DEFAULT_SAVED_GRUB2 && |
4500 |
|
cfi->defaultIsSaved) |
4501 |
|
config->defaultImage = 0; |
4502 |
entry = findEntryByIndex(config, config->defaultImage); |
entry = findEntryByIndex(config, config->defaultImage); |
4503 |
if (!entry) return 0; |
if (!entry) return 0; |
4504 |
if (!suitableImage(entry, bootPrefix, 0, flags)) return 0; |
if (!suitableImage(entry, bootPrefix, 0, flags)) return 0; |
4505 |
|
|
4506 |
line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines); |
line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines); |
4507 |
if (!line) return 0; |
if (!line) return 0; |
4508 |
|
|
4509 |
rootspec = getRootSpecifier(line->elements[1].item); |
rootspec = getRootSpecifier(line->elements[1].item); |
4517 |
struct singleEntry * entry; |
struct singleEntry * entry; |
4518 |
|
|
4519 |
if (config->defaultImage == -1) return 0; |
if (config->defaultImage == -1) return 0; |
4520 |
|
if (config->defaultImage == DEFAULT_SAVED_GRUB2 && |
4521 |
|
cfi->defaultIsSaved) |
4522 |
|
config->defaultImage = 0; |
4523 |
entry = findEntryByIndex(config, config->defaultImage); |
entry = findEntryByIndex(config, config->defaultImage); |
4524 |
if (!entry) return 0; |
if (!entry) return 0; |
4525 |
|
|
4542 |
|
|
4543 |
} else if (displayDefaultIndex) { |
} else if (displayDefaultIndex) { |
4544 |
if (config->defaultImage == -1) return 0; |
if (config->defaultImage == -1) return 0; |
4545 |
|
if (config->defaultImage == DEFAULT_SAVED_GRUB2 && |
4546 |
|
cfi->defaultIsSaved) |
4547 |
|
config->defaultImage = 0; |
4548 |
printf("%i\n", config->defaultImage); |
printf("%i\n", config->defaultImage); |
4549 |
return 0; |
return 0; |
4550 |
|
|
4564 |
if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs, |
if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs, |
4565 |
removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1; |
removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1; |
4566 |
if (updateKernelPath && newKernelInitrd) { |
if (updateKernelPath && newKernelInitrd) { |
4567 |
if (updateInitrd(config, updateKernelPath, bootPrefix, |
if (newMBKernel) { |
4568 |
newKernelInitrd)) return 1; |
if (addMBInitrd(config, newMBKernel, updateKernelPath, |
4569 |
|
bootPrefix, newKernelInitrd)) |
4570 |
|
return 1; |
4571 |
|
} else { |
4572 |
|
if (updateInitrd(config, updateKernelPath, bootPrefix, |
4573 |
|
newKernelInitrd)) |
4574 |
|
return 1; |
4575 |
|
} |
4576 |
} |
} |
4577 |
if (addNewKernel(config, template, bootPrefix, newKernelPath, |
if (addNewKernel(config, template, bootPrefix, newKernelPath, |
4578 |
newKernelTitle, newKernelArgs, newKernelInitrd, |
newKernelTitle, newKernelArgs, newKernelInitrd, |