182 |
"/boot/grub/grub.conf", |
"/boot/grub/grub.conf", |
183 |
"/boot/grub/menu.lst", |
"/boot/grub/menu.lst", |
184 |
"/etc/grub.conf", |
"/etc/grub.conf", |
185 |
|
"/boot/grub2/grub.cfg", |
186 |
|
"/boot/grub2-efi/grub.cfg", |
187 |
NULL |
NULL |
188 |
}; |
}; |
189 |
static int i = -1; |
static int i = -1; |
1068 |
return 0; |
return 0; |
1069 |
} |
} |
1070 |
|
|
1071 |
|
static int isnumber(const char *s) |
1072 |
|
{ |
1073 |
|
int i; |
1074 |
|
for (i = 0; s[i] != '\0'; i++) |
1075 |
|
if (s[i] < '0' || s[i] > '9') |
1076 |
|
return 0; |
1077 |
|
return i; |
1078 |
|
} |
1079 |
|
|
1080 |
static struct grubConfig * readConfig(const char * inName, |
static struct grubConfig * readConfig(const char * inName, |
1081 |
struct configFileInfo * cfi) { |
struct configFileInfo * cfi) { |
1082 |
int in; |
int in; |
1373 |
char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry"); |
char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry"); |
1374 |
if (defTitle) { |
if (defTitle) { |
1375 |
int index = 0; |
int index = 0; |
1376 |
entry = findEntryByTitle(cfg, defTitle, &index); |
if (isnumber(defTitle)) { |
1377 |
|
index = atoi(defTitle); |
1378 |
|
entry = findEntryByIndex(cfg, index); |
1379 |
|
} else { |
1380 |
|
entry = findEntryByTitle(cfg, defTitle, &index); |
1381 |
|
} |
1382 |
if (entry) |
if (entry) |
1383 |
cfg->defaultImage = index; |
cfg->defaultImage = index; |
1384 |
} |
} |
1427 |
char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry"); |
char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry"); |
1428 |
if (defTitle) { |
if (defTitle) { |
1429 |
int index = 0; |
int index = 0; |
1430 |
entry = findEntryByTitle(cfg, defTitle, &index); |
if (isnumber(defTitle)) { |
1431 |
|
index = atoi(defTitle); |
1432 |
|
entry = findEntryByIndex(cfg, index); |
1433 |
|
} else { |
1434 |
|
entry = findEntryByTitle(cfg, defTitle, &index); |
1435 |
|
} |
1436 |
if (entry) |
if (entry) |
1437 |
cfg->defaultImage = index; |
cfg->defaultImage = index; |
1438 |
} |
} |
2083 |
char *defTitle = cfg->cfi->getEnv(cfg->cfi, "saved_entry"); |
char *defTitle = cfg->cfi->getEnv(cfg->cfi, "saved_entry"); |
2084 |
if (defTitle) { |
if (defTitle) { |
2085 |
int index = 0; |
int index = 0; |
2086 |
entry = findEntryByTitle(cfg, defTitle, &index); |
if (isnumber(defTitle)) { |
2087 |
|
index = atoi(defTitle); |
2088 |
|
entry = findEntryByIndex(cfg, index); |
2089 |
|
} else { |
2090 |
|
entry = findEntryByTitle(cfg, defTitle, &index); |
2091 |
|
} |
2092 |
|
if (entry) |
2093 |
|
cfg->defaultImage = index; |
2094 |
} |
} |
2095 |
} |
} |
2096 |
} else if (cfg->defaultImage > -1) { |
} else if (cfg->defaultImage > -1) { |