60 |
|
|
61 |
int isEfi = 0; |
int isEfi = 0; |
62 |
|
|
63 |
|
#if defined(__arch64__) |
64 |
|
#define isEfiOnly 1 |
65 |
|
#else |
66 |
|
#define isEfiOnly 0 |
67 |
|
#endif |
68 |
|
|
69 |
char *saved_command_line = NULL; |
char *saved_command_line = NULL; |
70 |
|
|
71 |
/* comments get lumped in with indention */ |
/* comments get lumped in with indention */ |
161 |
int defaultIsVariable; |
int defaultIsVariable; |
162 |
int defaultSupportSaved; |
int defaultSupportSaved; |
163 |
int defaultIsSaved; |
int defaultIsSaved; |
164 |
|
int defaultIsUnquoted; |
165 |
enum lineType_e entryStart; |
enum lineType_e entryStart; |
166 |
enum lineType_e entryEnd; |
enum lineType_e entryEnd; |
167 |
int needsBootPrefix; |
int needsBootPrefix; |
637 |
.needsBootPrefix = 1, |
.needsBootPrefix = 1, |
638 |
.maxTitleLength = 255, |
.maxTitleLength = 255, |
639 |
.mbAllowExtraInitRds = 1, |
.mbAllowExtraInitRds = 1, |
640 |
|
.defaultIsUnquoted = 1, |
641 |
}; |
}; |
642 |
|
|
643 |
struct grubConfig { |
struct grubConfig { |
728 |
struct configFileInfo *cfi) { |
struct configFileInfo *cfi) { |
729 |
if (isEfi && cfi == &grub2ConfigType) { |
if (isEfi && cfi == &grub2ConfigType) { |
730 |
switch (type) { |
switch (type) { |
|
#if defined(__aarch64__) |
|
731 |
case LT_KERNEL: |
case LT_KERNEL: |
732 |
return LT_KERNEL; |
return isEfiOnly ? LT_KERNEL : LT_KERNEL_EFI; |
733 |
case LT_INITRD: |
case LT_INITRD: |
734 |
return LT_INITRD; |
return isEfiOnly ? LT_INITRD : LT_INITRD_EFI; |
|
#else |
|
|
case LT_KERNEL: |
|
|
return LT_KERNEL_EFI; |
|
|
case LT_INITRD: |
|
|
return LT_INITRD_EFI; |
|
|
#endif |
|
735 |
default: |
default: |
736 |
return type; |
return type; |
737 |
} |
} |
1193 |
cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT; |
cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT; |
1194 |
defaultLine = line; |
defaultLine = line; |
1195 |
} |
} |
|
} else if (line->type == LT_DEFAULT && line->numElements == 2) { |
|
|
cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT; |
|
|
defaultLine = line; |
|
1196 |
|
|
1197 |
} else if (iskernel(line->type)) { |
} else if (iskernel(line->type)) { |
1198 |
/* if by some freak chance this is multiboot and the "module" |
/* if by some freak chance this is multiboot and the "module" |
1199 |
* lines came earlier in the template, make sure to use LT_HYPER |
* lines came earlier in the template, make sure to use LT_HYPER |
1200 |
* instead of LT_KERNEL now |
* instead of LT_KERNEL now |
1201 |
*/ |
*/ |
1202 |
if (entry->multiboot) |
if (entry && entry->multiboot) |
1203 |
line->type = LT_HYPER; |
line->type = LT_HYPER; |
1204 |
|
|
1205 |
} else if (line->type == LT_MBMODULE) { |
} else if (line->type == LT_MBMODULE) { |
1225 |
cfg->fallbackImage = strtol(line->elements[1].item, &end, 10); |
cfg->fallbackImage = strtol(line->elements[1].item, &end, 10); |
1226 |
if (*end) cfg->fallbackImage = -1; |
if (*end) cfg->fallbackImage = -1; |
1227 |
|
|
1228 |
} else if (line->type == LT_TITLE && line->numElements > 1) { |
} else if ((line->type == LT_DEFAULT && cfi->defaultIsUnquoted) || |
1229 |
/* make the title a single argument (undoing our parsing) */ |
(line->type == LT_TITLE && line->numElements > 1)) { |
1230 |
|
/* make the title/default a single argument (undoing our parsing) */ |
1231 |
len = 0; |
len = 0; |
1232 |
for (int i = 1; i < line->numElements; i++) { |
for (int i = 1; i < line->numElements; i++) { |
1233 |
len += strlen(line->elements[i].item); |
len += strlen(line->elements[i].item); |
1334 |
} |
} |
1335 |
} |
} |
1336 |
|
|
1337 |
|
if (line->type == LT_DEFAULT && line->numElements == 2) { |
1338 |
|
cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT; |
1339 |
|
defaultLine = line; |
1340 |
|
} |
1341 |
|
|
1342 |
/* If we find a generic config option which should live at the |
/* If we find a generic config option which should live at the |
1343 |
top of the file, move it there. Old versions of grubby were |
top of the file, move it there. Old versions of grubby were |
1344 |
probably responsible for putting new images in the wrong |
probably responsible for putting new images in the wrong |