Magellan Linux

Diff of /trunk/grubby/grubby.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

trunk/mkinitrd-magellan/grubby/grubby.c revision 926 by niro, Wed Oct 28 13:29:38 2009 UTC trunk/grubby/grubby.c revision 2995 by niro, Thu Jun 30 10:37:52 2016 UTC
# Line 36  Line 36 
36  #include <signal.h>  #include <signal.h>
37  #include <blkid/blkid.h>  #include <blkid/blkid.h>
38    
39    #include "log.h"
40    
41    #ifndef DEBUG
42  #define DEBUG 0  #define DEBUG 0
43    #endif
44    
45  #if DEBUG  #if DEBUG
46  #define dbgPrintf(format, args...) fprintf(stderr, format , ## args)  #define dbgPrintf(format, args...) fprintf(stderr, format , ## args)
# Line 44  Line 48 
48  #define dbgPrintf(format, args...)  #define dbgPrintf(format, args...)
49  #endif  #endif
50    
51    int debug = 0; /* Currently just for template debugging */
52    
53  #define _(A) (A)  #define _(A) (A)
54    
55  #define MAX_EXTRA_INITRDS  16 /* code segment checked by --bootloader-probe */  #define MAX_EXTRA_INITRDS  16 /* code segment checked by --bootloader-probe */
56  #define CODE_SEG_SIZE  128 /* code segment checked by --bootloader-probe */  #define CODE_SEG_SIZE  128 /* code segment checked by --bootloader-probe */
57    
58    #define NOOP_OPCODE 0x90
59    #define JMP_SHORT_OPCODE 0xeb
60    
61    int isEfi = 0;
62    
63    #if defined(__aarch64__)
64    #define isEfiOnly 1
65    #else
66    #define isEfiOnly 0
67    #endif
68    
69    char *saved_command_line = NULL;
70    
71  /* comments get lumped in with indention */  /* comments get lumped in with indention */
72  struct lineElement {  struct lineElement {
73      char * item;      char * item;
# Line 56  struct lineElement { Line 75  struct lineElement {
75  };  };
76    
77  enum lineType_e {  enum lineType_e {
78      LT_WHITESPACE = 1 << 0,      LT_WHITESPACE   = 1 << 0,
79      LT_TITLE      = 1 << 1,      LT_TITLE        = 1 << 1,
80      LT_KERNEL     = 1 << 2,      LT_KERNEL       = 1 << 2,
81      LT_INITRD     = 1 << 3,      LT_INITRD       = 1 << 3,
82      LT_HYPER      = 1 << 4,      LT_HYPER        = 1 << 4,
83      LT_DEFAULT    = 1 << 5,      LT_DEFAULT      = 1 << 5,
84      LT_MBMODULE   = 1 << 6,      LT_MBMODULE     = 1 << 6,
85      LT_ROOT       = 1 << 7,      LT_ROOT         = 1 << 7,
86      LT_FALLBACK   = 1 << 8,      LT_FALLBACK     = 1 << 8,
87      LT_KERNELARGS = 1 << 9,      LT_KERNELARGS   = 1 << 9,
88      LT_BOOT       = 1 << 10,      LT_BOOT         = 1 << 10,
89      LT_BOOTROOT   = 1 << 11,      LT_BOOTROOT     = 1 << 11,
90      LT_LBA        = 1 << 12,      LT_LBA          = 1 << 12,
91      LT_OTHER      = 1 << 13,      LT_OTHER        = 1 << 13,
92      LT_GENERIC    = 1 << 14,      LT_GENERIC      = 1 << 14,
93      LT_UNKNOWN    = 1 << 15,      LT_ECHO    = 1 << 16,
94        LT_MENUENTRY    = 1 << 17,
95        LT_ENTRY_END    = 1 << 18,
96        LT_SET_VARIABLE = 1 << 19,
97        LT_KERNEL_EFI   = 1 << 20,
98        LT_INITRD_EFI   = 1 << 21,
99        LT_KERNEL_16    = 1 << 22,
100        LT_INITRD_16    = 1 << 23,
101        LT_DEVTREE      = 1 << 24,
102        LT_UNKNOWN      = 1 << 25,
103  };  };
104    
105  struct singleLine {  struct singleLine {
# Line 99  struct singleEntry { Line 127  struct singleEntry {
127  #define NEED_TITLE   (1 << 2)  #define NEED_TITLE   (1 << 2)
128  #define NEED_ARGS    (1 << 3)  #define NEED_ARGS    (1 << 3)
129  #define NEED_MB      (1 << 4)  #define NEED_MB      (1 << 4)
130    #define NEED_END     (1 << 5)
131    #define NEED_DEVTREE (1 << 6)
132    
133  #define MAIN_DEFAULT    (1 << 0)  #define MAIN_DEFAULT    (1 << 0)
134  #define DEFAULT_SAVED       -2  #define DEFAULT_SAVED       -2
135    #define DEFAULT_SAVED_GRUB2 -3
136    
137  struct keywordTypes {  struct keywordTypes {
138      char * key;      char * key;
# Line 110  struct keywordTypes { Line 141  struct keywordTypes {
141      char separatorChar;      char separatorChar;
142  };  };
143    
144    struct configFileInfo;
145    
146    typedef const char *(*findConfigFunc)(struct configFileInfo *);
147    typedef const int (*writeLineFunc)(struct configFileInfo *,
148     struct singleLine *line);
149    typedef char *(*getEnvFunc)(struct configFileInfo *, char *name);
150    typedef int (*setEnvFunc)(struct configFileInfo *, char *name, char *value);
151    
152  struct configFileInfo {  struct configFileInfo {
153      char * defaultConfig;      char * defaultConfig;
154        findConfigFunc findConfig;
155        writeLineFunc writeLine;
156        getEnvFunc getEnv;
157        setEnvFunc setEnv;
158      struct keywordTypes * keywords;      struct keywordTypes * keywords;
159        int caseInsensitive;
160      int defaultIsIndex;      int defaultIsIndex;
161        int defaultIsVariable;
162      int defaultSupportSaved;      int defaultSupportSaved;
163      enum lineType_e entrySeparator;      int defaultIsSaved;
164        int defaultIsUnquoted;
165        enum lineType_e entryStart;
166        enum lineType_e entryEnd;
167      int needsBootPrefix;      int needsBootPrefix;
168      int argsInQuotes;      int argsInQuotes;
169      int maxTitleLength;      int maxTitleLength;
170      int titleBracketed;      int titleBracketed;
171        int titlePosition;
172      int mbHyperFirst;      int mbHyperFirst;
173      int mbInitRdIsModule;      int mbInitRdIsModule;
174      int mbConcatArgs;      int mbConcatArgs;
175      int mbAllowExtraInitRds;      int mbAllowExtraInitRds;
176        char *envFile;
177  };  };
178    
179  struct keywordTypes grubKeywords[] = {  struct keywordTypes grubKeywords[] = {
# Line 138  struct keywordTypes grubKeywords[] = { Line 188  struct keywordTypes grubKeywords[] = {
188      { NULL,    0, 0 },      { NULL,    0, 0 },
189  };  };
190    
191    const char *grubFindConfig(struct configFileInfo *cfi) {
192        static const char *configFiles[] = {
193     "/boot/grub/grub.conf",
194     "/boot/grub/menu.lst",
195     "/etc/grub.conf",
196     "/boot/grub2/grub.cfg",
197     "/boot/grub2-efi/grub.cfg",
198     NULL
199        };
200        static int i = -1;
201    
202        if (i == -1) {
203     for (i = 0; configFiles[i] != NULL; i++) {
204        dbgPrintf("Checking \"%s\": ", configFiles[i]);
205        if (!access(configFiles[i], R_OK)) {
206     dbgPrintf("found\n");
207     return configFiles[i];
208        }
209        dbgPrintf("not found\n");
210     }
211        }
212        return configFiles[i];
213    }
214    
215  struct configFileInfo grubConfigType = {  struct configFileInfo grubConfigType = {
216      "/boot/grub/grub.conf",    /* defaultConfig */      .findConfig = grubFindConfig,
217      grubKeywords,    /* keywords */      .keywords = grubKeywords,
218      1,    /* defaultIsIndex */      .defaultIsIndex = 1,
219      1,    /* defaultSupportSaved */      .defaultSupportSaved = 1,
220      LT_TITLE,    /* entrySeparator */      .entryStart = LT_TITLE,
221      1,    /* needsBootPrefix */      .needsBootPrefix = 1,
222      0,    /* argsInQuotes */      .mbHyperFirst = 1,
223      0,    /* maxTitleLength */      .mbInitRdIsModule = 1,
224      0,                                      /* titleBracketed */      .mbAllowExtraInitRds = 1,
225      1,                                      /* mbHyperFirst */      .titlePosition = 1,
226      1,                                      /* mbInitRdIsModule */  };
227      0,                                      /* mbConcatArgs */  
228      1,                                      /* mbAllowExtraInitRds */  struct keywordTypes grub2Keywords[] = {
229        { "menuentry",  LT_MENUENTRY,   ' ' },
230        { "}",          LT_ENTRY_END,   ' ' },
231        { "echo",       LT_ECHO,        ' ' },
232        { "set",        LT_SET_VARIABLE,' ', '=' },
233        { "root",       LT_BOOTROOT,    ' ' },
234        { "default",    LT_DEFAULT,     ' ' },
235        { "fallback",   LT_FALLBACK,    ' ' },
236        { "linux",      LT_KERNEL,      ' ' },
237        { "linuxefi",   LT_KERNEL_EFI,  ' ' },
238        { "linux16",    LT_KERNEL_16,   ' ' },
239        { "initrd",     LT_INITRD,      ' ', ' ' },
240        { "initrdefi",  LT_INITRD_EFI,  ' ', ' ' },
241        { "initrd16",   LT_INITRD_16,   ' ', ' ' },
242        { "module",     LT_MBMODULE,    ' ' },
243        { "kernel",     LT_HYPER,       ' ' },
244        { "devicetree", LT_DEVTREE,  ' ' },
245        { NULL, 0, 0 },
246    };
247    
248    const char *grub2FindConfig(struct configFileInfo *cfi) {
249        static const char *configFiles[] = {
250     "/boot/grub/grub-efi.cfg",
251     "/boot/grub/grub.cfg",
252     NULL
253        };
254        static int i = -1;
255        static const char *grub_cfg = "/boot/grub/grub.cfg";
256        int rc = -1;
257    
258        if (i == -1) {
259     for (i = 0; configFiles[i] != NULL; i++) {
260        dbgPrintf("Checking \"%s\": ", configFiles[i]);
261        if ((rc = access(configFiles[i], R_OK))) {
262     if (errno == EACCES) {
263        printf("Unable to access bootloader configuration file "
264           "\"%s\": %m\n", configFiles[i]);
265        exit(1);
266     }
267     continue;
268        } else {
269     dbgPrintf("found\n");
270     return configFiles[i];
271        }
272     }
273        }
274    
275        /* Ubuntu renames grub2 to grub, so check for the grub.d directory
276         * that isn't in grub1, and if it exists, return the config file path
277         * that they use. */
278        if (configFiles[i] == NULL && !access("/etc/grub.d/", R_OK)) {
279     dbgPrintf("found\n");
280     return grub_cfg;
281        }
282    
283        dbgPrintf("not found\n");
284        return configFiles[i];
285    }
286    
287    /* kind of hacky.  It'll give the first 1024 bytes, ish. */
288    static char *grub2GetEnv(struct configFileInfo *info, char *name)
289    {
290        static char buf[1025];
291        char *s = NULL;
292        char *ret = NULL;
293        char *envFile = info->envFile ? info->envFile : "/boot/grub/grubenv";
294        int rc = asprintf(&s, "grub-editenv %s list | grep '^%s='", envFile, name);
295    
296        if (rc < 0)
297     return NULL;
298    
299        FILE *f = popen(s, "r");
300        if (!f)
301     goto out;
302    
303        memset(buf, '\0', sizeof (buf));
304        ret = fgets(buf, 1024, f);
305        pclose(f);
306    
307        if (ret) {
308     ret += strlen(name) + 1;
309     ret[strlen(ret) - 1] = '\0';
310        }
311        dbgPrintf("grub2GetEnv(%s): %s\n", name, ret);
312    out:
313        free(s);
314        return ret;
315    }
316    
317    static int sPopCount(const char *s, const char *c)
318    {
319        int ret = 0;
320        if (!s)
321     return -1;
322        for (int i = 0; s[i] != '\0'; i++)
323     for (int j = 0; c[j] != '\0'; j++)
324        if (s[i] == c[j])
325     ret++;
326        return ret;
327    }
328    
329    static char *shellEscape(const char *s)
330    {
331        int l = strlen(s) + sPopCount(s, "'") * 2;
332    
333        char *ret = calloc(l+1, sizeof (*ret));
334        if (!ret)
335     return NULL;
336        for (int i = 0, j = 0; s[i] != '\0'; i++, j++) {
337     if (s[i] == '\'')
338        ret[j++] = '\\';
339     ret[j] = s[i];
340        }
341        return ret;
342    }
343    
344    static void unquote(char *s)
345    {
346        int l = strlen(s);
347    
348        if ((s[l-1] == '\'' && s[0] == '\'') || (s[l-1] == '"' && s[0] == '"')) {
349     memmove(s, s+1, l-2);
350     s[l-2] = '\0';
351        }
352    }
353    
354    static int grub2SetEnv(struct configFileInfo *info, char *name, char *value)
355    {
356        char *s = NULL;
357        int rc = 0;
358        char *envFile = info->envFile ? info->envFile : "/boot/grub/grubenv";
359    
360        unquote(value);
361        value = shellEscape(value);
362        if (!value)
363        return -1;
364    
365        rc = asprintf(&s, "grub-editenv %s set '%s=%s'", envFile, name, value);
366        free(value);
367        if (rc <0)
368     return -1;
369    
370        dbgPrintf("grub2SetEnv(%s): %s\n", name, s);
371        rc = system(s);
372        free(s);
373        return rc;
374    }
375    
376    /* this is a gigantic hack to avoid clobbering grub2 variables... */
377    static int is_special_grub2_variable(const char *name)
378    {
379        if (!strcmp(name,"\"${next_entry}\""))
380     return 1;
381        if (!strcmp(name,"\"${prev_saved_entry}\""))
382     return 1;
383        return 0;
384    }
385    
386    int sizeOfSingleLine(struct singleLine * line) {
387      int count = 0;
388    
389      for (int i = 0; i < line->numElements; i++) {
390        int indentSize = 0;
391    
392        count = count + strlen(line->elements[i].item);
393    
394        indentSize = strlen(line->elements[i].indent);
395        if (indentSize > 0)
396          count = count + indentSize;
397        else
398          /* be extra safe and add room for whitespaces */
399          count = count + 1;
400      }
401    
402      /* room for trailing terminator */
403      count = count + 1;
404    
405      return count;
406    }
407    
408    static int isquote(char q)
409    {
410        if (q == '\'' || q == '\"')
411     return 1;
412        return 0;
413    }
414    
415    static int iskernel(enum lineType_e type) {
416        return (type == LT_KERNEL || type == LT_KERNEL_EFI || type == LT_KERNEL_16);
417    }
418    
419    static int isinitrd(enum lineType_e type) {
420        return (type == LT_INITRD || type == LT_INITRD_EFI || type == LT_INITRD_16);
421    }
422    
423    char *grub2ExtractTitle(struct singleLine * line) {
424        char * current;
425        char * current_indent;
426        int current_len;
427        int current_indent_len;
428        int i;
429    
430        /* bail out if line does not start with menuentry */
431        if (strcmp(line->elements[0].item, "menuentry"))
432     return NULL;
433    
434        i = 1;
435        current = line->elements[i].item;
436        current_len = strlen(current);
437    
438        /* if second word is quoted, strip the quotes and return single word */
439        if (isquote(*current) && isquote(current[current_len - 1])) {
440     char *tmp;
441    
442     tmp = strdup(current+1);
443     if (!tmp)
444        return NULL;
445     tmp[strlen(tmp)-1] = '\0';
446     return tmp;
447        }
448    
449        /* if no quotes, return second word verbatim */
450        if (!isquote(*current))
451     return current;
452    
453        /* second element start with a quote, so we have to find the element
454         * whose last character is also quote (assuming it's the closing one) */
455        int resultMaxSize;
456        char * result;
457        /* need to ensure that ' does not match " as we search */
458        char quote_char = *current;
459    
460        resultMaxSize = sizeOfSingleLine(line);
461        result = malloc(resultMaxSize);
462        snprintf(result, resultMaxSize, "%s", ++current);
463    
464        i++;
465        for (; i < line->numElements; ++i) {
466     current = line->elements[i].item;
467     current_len = strlen(current);
468     current_indent = line->elements[i].indent;
469     current_indent_len = strlen(current_indent);
470    
471     strncat(result, current_indent, current_indent_len);
472     if (current[current_len-1] != quote_char) {
473        strncat(result, current, current_len);
474     } else {
475        strncat(result, current, current_len - 1);
476        break;
477     }
478        }
479        return result;
480    }
481    
482    struct configFileInfo grub2ConfigType = {
483        .findConfig = grub2FindConfig,
484        .getEnv = grub2GetEnv,
485        .setEnv = grub2SetEnv,
486        .keywords = grub2Keywords,
487        .defaultIsIndex = 1,
488        .defaultSupportSaved = 1,
489        .defaultIsVariable = 1,
490        .entryStart = LT_MENUENTRY,
491        .entryEnd = LT_ENTRY_END,
492        .titlePosition = 1,
493        .needsBootPrefix = 1,
494        .mbHyperFirst = 1,
495        .mbInitRdIsModule = 1,
496        .mbAllowExtraInitRds = 1,
497  };  };
498    
499  struct keywordTypes yabootKeywords[] = {  struct keywordTypes yabootKeywords[] = {
# Line 245  struct keywordTypes extlinuxKeywords[] = Line 587  struct keywordTypes extlinuxKeywords[] =
587      { "initrd",    LT_INITRD,      ' ', ',' },      { "initrd",    LT_INITRD,      ' ', ',' },
588      { "append",    LT_KERNELARGS,  ' ' },      { "append",    LT_KERNELARGS,  ' ' },
589      { "prompt",     LT_UNKNOWN,     ' ' },      { "prompt",     LT_UNKNOWN,     ' ' },
590        { "fdt",        LT_DEVTREE,     ' ' },
591        { "fdtdir",     LT_DEVTREE,     ' ' },
592      { NULL,    0, 0 },      { NULL,    0, 0 },
593  };  };
594  int useextlinuxmenu;  int useextlinuxmenu;
595  struct configFileInfo eliloConfigType = {  struct configFileInfo eliloConfigType = {
596      "/boot/efi/EFI/redhat/elilo.conf",    /* defaultConfig */      .defaultConfig = "/boot/efi/EFI/redhat/elilo.conf",
597      eliloKeywords,    /* keywords */      .keywords = eliloKeywords,
598      0,    /* defaultIsIndex */      .entryStart = LT_KERNEL,
599      0,    /* defaultSupportSaved */      .needsBootPrefix = 1,
600      LT_KERNEL,    /* entrySeparator */      .argsInQuotes = 1,
601      1,                    /* needsBootPrefix */      .mbConcatArgs = 1,
602      1,    /* argsInQuotes */      .titlePosition = 1,
     0,    /* maxTitleLength */  
     0,                                      /* titleBracketed */  
     0,                                      /* mbHyperFirst */  
     0,                                      /* mbInitRdIsModule */  
     1,                                      /* mbConcatArgs */  
     0,                                      /* mbAllowExtraInitRds */  
603  };  };
604    
605  struct configFileInfo liloConfigType = {  struct configFileInfo liloConfigType = {
606      "/etc/lilo.conf",    /* defaultConfig */      .defaultConfig = "/etc/lilo.conf",
607      liloKeywords,    /* keywords */      .keywords = liloKeywords,
608      0,    /* defaultIsIndex */      .entryStart = LT_KERNEL,
609      0,    /* defaultSupportSaved */      .argsInQuotes = 1,
610      LT_KERNEL,    /* entrySeparator */      .maxTitleLength = 15,
611      0,    /* needsBootPrefix */      .titlePosition = 1,
     1,    /* argsInQuotes */  
     15,    /* maxTitleLength */  
     0,                                      /* titleBracketed */  
     0,                                      /* mbHyperFirst */  
     0,                                      /* mbInitRdIsModule */  
     0,                                      /* mbConcatArgs */  
     0,                                      /* mbAllowExtraInitRds */  
612  };  };
613    
614  struct configFileInfo yabootConfigType = {  struct configFileInfo yabootConfigType = {
615      "/etc/yaboot.conf",    /* defaultConfig */      .defaultConfig = "/etc/yaboot.conf",
616      yabootKeywords,    /* keywords */      .keywords = yabootKeywords,
617      0,    /* defaultIsIndex */      .entryStart = LT_KERNEL,
618      0,    /* defaultSupportSaved */      .needsBootPrefix = 1,
619      LT_KERNEL,    /* entrySeparator */      .argsInQuotes = 1,
620      1,    /* needsBootPrefix */      .maxTitleLength = 15,
621      1,    /* argsInQuotes */      .mbAllowExtraInitRds = 1,
622      15,    /* maxTitleLength */      .titlePosition = 1,
     0,                                      /* titleBracketed */  
     0,                                      /* mbHyperFirst */  
     0,                                      /* mbInitRdIsModule */  
     0,                                      /* mbConcatArgs */  
     1,                                      /* mbAllowExtraInitRds */  
623  };  };
624    
625  struct configFileInfo siloConfigType = {  struct configFileInfo siloConfigType = {
626      "/etc/silo.conf",    /* defaultConfig */      .defaultConfig = "/etc/silo.conf",
627      siloKeywords,    /* keywords */      .keywords = siloKeywords,
628      0,    /* defaultIsIndex */      .entryStart = LT_KERNEL,
629      0,    /* defaultSupportSaved */      .needsBootPrefix = 1,
630      LT_KERNEL,    /* entrySeparator */      .argsInQuotes = 1,
631      1,    /* needsBootPrefix */      .maxTitleLength = 15,
632      1,    /* argsInQuotes */      .titlePosition = 1,
     15,    /* maxTitleLength */  
     0,                                      /* titleBracketed */  
     0,                                      /* mbHyperFirst */  
     0,                                      /* mbInitRdIsModule */  
     0,                                      /* mbConcatArgs */  
     0,                                      /* mbAllowExtraInitRds */  
633  };  };
634    
635  struct configFileInfo ziplConfigType = {  struct configFileInfo ziplConfigType = {
636      "/etc/zipl.conf",    /* defaultConfig */      .defaultConfig = "/etc/zipl.conf",
637      ziplKeywords,    /* keywords */      .keywords = ziplKeywords,
638      0,    /* defaultIsIndex */      .entryStart = LT_TITLE,
639      0,    /* defaultSupportSaved */      .argsInQuotes = 1,
640      LT_TITLE,    /* entrySeparator */      .titleBracketed = 1,
     0,    /* needsBootPrefix */  
     1,    /* argsInQuotes */  
     0,    /* maxTitleLength */  
     1,                                      /* titleBracketed */  
     0,                                      /* mbHyperFirst */  
     0,                                      /* mbInitRdIsModule */  
     0,                                      /* mbConcatArgs */  
     0,                                      /* mbAllowExtraInitRds */  
641  };  };
642    
643  struct configFileInfo extlinuxConfigType = {  struct configFileInfo extlinuxConfigType = {
644      "/boot/extlinux/extlinux.conf",         /* defaultConfig */      .defaultConfig = "/boot/extlinux/extlinux.conf",
645      extlinuxKeywords,                       /* keywords */      .keywords = extlinuxKeywords,
646      0,                                      /* defaultIsIndex */      .caseInsensitive = 1,
647      0,                                      /* defaultSupportSaved */      .entryStart = LT_TITLE,
648      LT_TITLE,                               /* entrySeparator */      .needsBootPrefix = 1,
649      1,                                      /* needsBootPrefix */      .maxTitleLength = 255,
650      0,                                      /* argsInQuotes */      .mbAllowExtraInitRds = 1,
651      255,                                    /* maxTitleLength */      .defaultIsUnquoted = 1,
652      0,                                      /* titleBracketed */      .titlePosition = 1,
     0,                                      /* mbHyperFirst */  
     0,                                      /* mbInitRdIsModule */  
     0,                                      /* mbConcatArgs */  
     1,                                      /* mbAllowExtraInitRds */  
653  };  };
654    
655  struct grubConfig {  struct grubConfig {
# Line 356  struct grubConfig { Line 664  struct grubConfig {
664      struct configFileInfo * cfi;      struct configFileInfo * cfi;
665  };  };
666    
667    blkid_cache blkid;
668    
669  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index);  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index);
670  struct singleEntry * findEntryByPath(struct grubConfig * cfg,  struct singleEntry * findEntryByPath(struct grubConfig * cfg,
671       const char * path, const char * prefix,       const char * path, const char * prefix,
672       int * index);       int * index);
673    struct singleEntry * findEntryByTitle(struct grubConfig * cfg, char *title,
674          int * index);
675  static int readFile(int fd, char ** bufPtr);  static int readFile(int fd, char ** bufPtr);
676  static void lineInit(struct singleLine * line);  static void lineInit(struct singleLine * line);
677  struct singleLine * lineDup(struct singleLine * line);  struct singleLine * lineDup(struct singleLine * line);
# Line 369  static int lineWrite(FILE * out, struct Line 681  static int lineWrite(FILE * out, struct
681  static int getNextLine(char ** bufPtr, struct singleLine * line,  static int getNextLine(char ** bufPtr, struct singleLine * line,
682         struct configFileInfo * cfi);         struct configFileInfo * cfi);
683  static char * getRootSpecifier(char * str);  static char * getRootSpecifier(char * str);
684    static void requote(struct singleLine *line, struct configFileInfo * cfi);
685  static void insertElement(struct singleLine * line,  static void insertElement(struct singleLine * line,
686    const char * item, int insertHere,    const char * item, int insertHere,
687    struct configFileInfo * cfi);    struct configFileInfo * cfi);
# Line 423  static char * sdupprintf(const char *for Line 736  static char * sdupprintf(const char *for
736      return buf;      return buf;
737  }  }
738    
739    static enum lineType_e preferredLineType(enum lineType_e type,
740     struct configFileInfo *cfi) {
741        if (isEfi && cfi == &grub2ConfigType) {
742     switch (type) {
743     case LT_KERNEL:
744        return isEfiOnly ? LT_KERNEL : LT_KERNEL_EFI;
745     case LT_INITRD:
746        return isEfiOnly ? LT_INITRD : LT_INITRD_EFI;
747     default:
748        return type;
749     }
750    #if defined(__i386__) || defined(__x86_64__)
751        } else if (cfi == &grub2ConfigType) {
752     switch (type) {
753     case LT_KERNEL:
754        return LT_KERNEL_16;
755     case LT_INITRD:
756        return LT_INITRD_16;
757     default:
758        return type;
759     }
760    #endif
761        }
762        return type;
763    }
764    
765  static struct keywordTypes * getKeywordByType(enum lineType_e type,  static struct keywordTypes * getKeywordByType(enum lineType_e type,
766        struct configFileInfo * cfi) {        struct configFileInfo * cfi) {
767      struct keywordTypes * kw;      for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
     for (kw = cfi->keywords; kw->key; kw++) {  
768   if (kw->type == type)   if (kw->type == type)
769      return kw;      return kw;
770      }      }
771      return NULL;      return NULL;
772  }  }
773    
774  static char * getpathbyspec(char *device) {  static char *getKeyByType(enum lineType_e type, struct configFileInfo * cfi) {
775      static blkid_cache blkid;      struct keywordTypes *kt = getKeywordByType(type, cfi);
776        if (kt)
777     return kt->key;
778        return "unknown";
779    }
780    
781    static char * getpathbyspec(char *device) {
782      if (!blkid)      if (!blkid)
783          blkid_get_cache(&blkid, NULL);          blkid_get_cache(&blkid, NULL);
784    
785      return blkid_get_devname(blkid, device, NULL);      return blkid_get_devname(blkid, device, NULL);
786  }  }
787    
788    static char * getuuidbydev(char *device) {
789        if (!blkid)
790     blkid_get_cache(&blkid, NULL);
791    
792        return blkid_get_tag_value(blkid, "UUID", device);
793    }
794    
795  static enum lineType_e getTypeByKeyword(char * keyword,  static enum lineType_e getTypeByKeyword(char * keyword,
796   struct configFileInfo * cfi) {   struct configFileInfo * cfi) {
797      struct keywordTypes * kw;      for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
798      for (kw = cfi->keywords; kw->key; kw++) {   if (cfi->caseInsensitive) {
799   if (!strcmp(keyword, kw->key))      if (!strcasecmp(keyword, kw->key))
800      return kw->type;                  return kw->type;
801     } else {
802        if (!strcmp(keyword, kw->key))
803            return kw->type;
804     }
805      }      }
806      return LT_UNKNOWN;      return LT_UNKNOWN;
807  }  }
# Line 477  static int isBracketedTitle(struct singl Line 831  static int isBracketedTitle(struct singl
831      return 0;      return 0;
832  }  }
833    
834  static int isEntrySeparator(struct singleLine * line,  static int isEntryStart(struct singleLine * line,
835                              struct configFileInfo * cfi) {                              struct configFileInfo * cfi) {
836      return line->type == cfi->entrySeparator || line->type == LT_OTHER ||      return line->type == cfi->entryStart || line->type == LT_OTHER ||
837   (cfi->titleBracketed && isBracketedTitle(line));   (cfi->titleBracketed && isBracketedTitle(line));
838  }  }
839    
840  /* extract the title from within brackets (for zipl) */  /* extract the title from within brackets (for zipl) */
841  static char * extractTitle(struct singleLine * line) {  static char * extractTitle(struct grubConfig *cfg, struct singleLine * line) {
842      /* bracketed title... let's extract it (leaks a byte) */      /* bracketed title... let's extract it */
843      char * title;      char * title = NULL;
844      title = strdup(line->elements[0].item);      if (line->type == LT_TITLE) {
845      title++;   char *tmp = line->elements[cfg->cfi->titlePosition].item;
846      *(title + strlen(title) - 1) = '\0';   if (cfg->cfi->titleBracketed) {
847        tmp++;
848        title = strdup(tmp);
849        *(title + strlen(title) - 1) = '\0';
850     } else {
851        title = strdup(tmp);
852     }
853        } else if (line->type == LT_MENUENTRY)
854     title = strdup(line->elements[1].item);
855        else
856     return NULL;
857      return title;      return title;
858  }  }
859    
# Line 532  static void lineInit(struct singleLine * Line 896  static void lineInit(struct singleLine *
896  }  }
897    
898  struct singleLine * lineDup(struct singleLine * line) {  struct singleLine * lineDup(struct singleLine * line) {
     int i;  
899      struct singleLine * newLine = malloc(sizeof(*newLine));      struct singleLine * newLine = malloc(sizeof(*newLine));
900    
901      newLine->indent = strdup(line->indent);      newLine->indent = strdup(line->indent);
# Line 542  struct singleLine * lineDup(struct singl Line 905  struct singleLine * lineDup(struct singl
905      newLine->elements = malloc(sizeof(*newLine->elements) *      newLine->elements = malloc(sizeof(*newLine->elements) *
906         newLine->numElements);         newLine->numElements);
907    
908      for (i = 0; i < newLine->numElements; i++) {      for (int i = 0; i < newLine->numElements; i++) {
909   newLine->elements[i].indent = strdup(line->elements[i].indent);   newLine->elements[i].indent = strdup(line->elements[i].indent);
910   newLine->elements[i].item = strdup(line->elements[i].item);   newLine->elements[i].item = strdup(line->elements[i].item);
911      }      }
# Line 551  struct singleLine * lineDup(struct singl Line 914  struct singleLine * lineDup(struct singl
914  }  }
915    
916  static void lineFree(struct singleLine * line) {  static void lineFree(struct singleLine * line) {
     int i;  
   
917      if (line->indent) free(line->indent);      if (line->indent) free(line->indent);
918    
919      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
920   free(line->elements[i].item);   free(line->elements[i].item);
921   free(line->elements[i].indent);   free(line->elements[i].indent);
922      }      }
# Line 566  static void lineFree(struct singleLine * Line 927  static void lineFree(struct singleLine *
927    
928  static int lineWrite(FILE * out, struct singleLine * line,  static int lineWrite(FILE * out, struct singleLine * line,
929       struct configFileInfo * cfi) {       struct configFileInfo * cfi) {
     int i;  
   
930      if (fprintf(out, "%s", line->indent) == -1) return -1;      if (fprintf(out, "%s", line->indent) == -1) return -1;
931    
932      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
933     /* Need to handle this, because we strip the quotes from
934     * menuentry when read it. */
935     if (line->type == LT_MENUENTRY && i == 1) {
936        if(!isquote(*line->elements[i].item)) {
937     int substring = 0;
938     /* If the line contains nested quotes, we did not strip
939     * the "interna" quotes and we must use the right quotes
940     * again when writing the updated file. */
941     for (int j = i; j < line->numElements; j++) {
942        if (strchr(line->elements[i].item, '\'') != NULL) {
943           substring = 1;
944           fprintf(out, "\"%s\"", line->elements[i].item);
945           break;
946        }
947     }
948     if (!substring)
949        fprintf(out, "\'%s\'", line->elements[i].item);
950        } else {
951     fprintf(out, "%s", line->elements[i].item);
952        }
953        fprintf(out, "%s", line->elements[i].indent);
954    
955        continue;
956     }
957    
958   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)
959      if (fputc('"', out) == EOF) return -1;      if (fputc('"', out) == EOF) return -1;
960    
# Line 664  static int getNextLine(char ** bufPtr, s Line 1048  static int getNextLine(char ** bufPtr, s
1048      if (*line->elements[0].item == '#') {      if (*line->elements[0].item == '#') {
1049   char * fullLine;   char * fullLine;
1050   int len;   int len;
  int i;  
1051    
1052   len = strlen(line->indent);   len = strlen(line->indent);
1053   for (i = 0; i < line->numElements; i++)   for (int i = 0; i < line->numElements; i++)
1054      len += strlen(line->elements[i].item) +      len += strlen(line->elements[i].item) +
1055     strlen(line->elements[i].indent);     strlen(line->elements[i].indent);
1056    
# Line 676  static int getNextLine(char ** bufPtr, s Line 1059  static int getNextLine(char ** bufPtr, s
1059   free(line->indent);   free(line->indent);
1060   line->indent = fullLine;   line->indent = fullLine;
1061    
1062   for (i = 0; i < line->numElements; i++) {   for (int i = 0; i < line->numElements; i++) {
1063      strcat(fullLine, line->elements[i].item);      strcat(fullLine, line->elements[i].item);
1064      strcat(fullLine, line->elements[i].indent);      strcat(fullLine, line->elements[i].indent);
1065      free(line->elements[i].item);      free(line->elements[i].item);
# Line 695  static int getNextLine(char ** bufPtr, s Line 1078  static int getNextLine(char ** bufPtr, s
1078   * elements up more   * elements up more
1079   */   */
1080   if (!isspace(kw->separatorChar)) {   if (!isspace(kw->separatorChar)) {
     int i;  
1081      char indent[2] = "";      char indent[2] = "";
1082      indent[0] = kw->separatorChar;      indent[0] = kw->separatorChar;
1083      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
1084   char *p;   char *p;
  int j;  
1085   int numNewElements;   int numNewElements;
1086    
1087   numNewElements = 0;   numNewElements = 0;
# Line 716  static int getNextLine(char ** bufPtr, s Line 1097  static int getNextLine(char ** bufPtr, s
1097      sizeof(*line->elements) * elementsAlloced);      sizeof(*line->elements) * elementsAlloced);
1098   }   }
1099    
1100   for (j = line->numElements; j > i; j--) {   for (int j = line->numElements; j > i; j--) {
1101   line->elements[j + numNewElements] = line->elements[j];   line->elements[j + numNewElements] = line->elements[j];
1102   }   }
1103   line->numElements += numNewElements;   line->numElements += numNewElements;
# Line 729  static int getNextLine(char ** bufPtr, s Line 1110  static int getNextLine(char ** bufPtr, s
1110   break;   break;
1111   }   }
1112    
1113   free(line->elements[i].indent);   line->elements[i + 1].indent = line->elements[i].indent;
1114   line->elements[i].indent = strdup(indent);   line->elements[i].indent = strdup(indent);
1115   *p++ = '\0';   *p++ = '\0';
1116   i++;   i++;
1117   line->elements[i].item = strdup(p);   line->elements[i].item = strdup(p);
  line->elements[i].indent = strdup("");  
  p = line->elements[i].item;  
1118   }   }
1119      }      }
1120   }   }
# Line 745  static int getNextLine(char ** bufPtr, s Line 1124  static int getNextLine(char ** bufPtr, s
1124      return 0;      return 0;
1125  }  }
1126    
1127    static int isnumber(const char *s)
1128    {
1129        int i;
1130        for (i = 0; s[i] != '\0'; i++)
1131     if (s[i] < '0' || s[i] > '9')
1132        return 0;
1133        return i;
1134    }
1135    
1136  static struct grubConfig * readConfig(const char * inName,  static struct grubConfig * readConfig(const char * inName,
1137        struct configFileInfo * cfi) {        struct configFileInfo * cfi) {
1138      int in;      int in;
# Line 756  static struct grubConfig * readConfig(co Line 1144  static struct grubConfig * readConfig(co
1144      struct singleLine * last = NULL, * line, * defaultLine = NULL;      struct singleLine * last = NULL, * line, * defaultLine = NULL;
1145      char * end;      char * end;
1146      struct singleEntry * entry = NULL;      struct singleEntry * entry = NULL;
1147      int i, len;      int len;
1148      char * buf;      char * buf;
1149    
1150      if (!strcmp(inName, "-")) {      if (inName == NULL) {
1151            printf("Could not find bootloader configuration\n");
1152            exit(1);
1153        } else if (!strcmp(inName, "-")) {
1154   in = 0;   in = 0;
1155      } else {      } else {
1156   if ((in = open(inName, O_RDONLY)) < 0) {   if ((in = open(inName, O_RDONLY)) < 0) {
# Line 802  static struct grubConfig * readConfig(co Line 1193  static struct grubConfig * readConfig(co
1193      cfg->secondaryIndent = strdup(line->indent);      cfg->secondaryIndent = strdup(line->indent);
1194   }   }
1195    
1196   if (isEntrySeparator(line, cfi)) {   if (isEntryStart(line, cfi) || (cfg->entries && !sawEntry)) {
1197      sawEntry = 1;      sawEntry = 1;
1198      if (!entry) {      if (!entry) {
1199   cfg->entries = malloc(sizeof(*entry));   cfg->entries = malloc(sizeof(*entry));
# Line 818  static struct grubConfig * readConfig(co Line 1209  static struct grubConfig * readConfig(co
1209      entry->next = NULL;      entry->next = NULL;
1210   }   }
1211    
1212   if (line->type == LT_DEFAULT && line->numElements == 2) {   if (line->type == LT_SET_VARIABLE) {
1213      cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;      dbgPrintf("found 'set' command (%d elements): ", line->numElements);
1214      defaultLine = line;      dbgPrintf("%s", line->indent);
1215        for (int i = 0; i < line->numElements; i++)
1216     dbgPrintf("\"%s\"%s", line->elements[i].item, line->elements[i].indent);
1217        dbgPrintf("\n");
1218        struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
1219        if (kwType && line->numElements == 3 &&
1220        !strcmp(line->elements[1].item, kwType->key) &&
1221        !is_special_grub2_variable(line->elements[2].item)) {
1222     dbgPrintf("Line sets default config\n");
1223     cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
1224     defaultLine = line;
1225        }
1226    
1227          } else if (line->type == LT_KERNEL) {          } else if (iskernel(line->type)) {
1228      /* if by some freak chance this is multiboot and the "module"      /* if by some freak chance this is multiboot and the "module"
1229       * lines came earlier in the template, make sure to use LT_HYPER       * lines came earlier in the template, make sure to use LT_HYPER
1230       * instead of LT_KERNEL now       * instead of LT_KERNEL now
1231       */       */
1232      if (entry->multiboot)      if (entry && entry->multiboot)
1233   line->type = LT_HYPER;   line->type = LT_HYPER;
1234    
1235          } else if (line->type == LT_MBMODULE) {          } else if (line->type == LT_MBMODULE) {
# Line 836  static struct grubConfig * readConfig(co Line 1238  static struct grubConfig * readConfig(co
1238       * This only applies to grub, but that's the only place we       * This only applies to grub, but that's the only place we
1239       * should find LT_MBMODULE lines anyway.       * should find LT_MBMODULE lines anyway.
1240       */       */
1241      struct singleLine * l;      for (struct singleLine *l = entry->lines; l; l = l->next) {
     for (l = entry->lines; l; l = l->next) {  
1242   if (l->type == LT_HYPER)   if (l->type == LT_HYPER)
1243      break;      break;
1244   else if (l->type == LT_KERNEL) {   else if (iskernel(l->type)) {
1245      l->type = LT_HYPER;      l->type = LT_HYPER;
1246      break;      break;
1247   }   }
# Line 854  static struct grubConfig * readConfig(co Line 1255  static struct grubConfig * readConfig(co
1255      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);
1256      if (*end) cfg->fallbackImage = -1;      if (*end) cfg->fallbackImage = -1;
1257    
1258   } else if (line->type == LT_TITLE && line->numElements > 1) {   } else if ((line->type == LT_DEFAULT && cfi->defaultIsUnquoted) ||
1259      /* make the title a single argument (undoing our parsing) */                  (line->type == LT_TITLE && line->numElements > 1)) {
1260        /* make the title/default a single argument (undoing our parsing) */
1261      len = 0;      len = 0;
1262      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
1263   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
1264   len += strlen(line->elements[i].indent);   len += strlen(line->elements[i].indent);
1265      }      }
1266      buf = malloc(len + 1);      buf = malloc(len + 1);
1267      *buf = '\0';      *buf = '\0';
1268    
1269      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
1270   strcat(buf, line->elements[i].item);   strcat(buf, line->elements[i].item);
1271   free(line->elements[i].item);   free(line->elements[i].item);
1272    
# Line 878  static struct grubConfig * readConfig(co Line 1280  static struct grubConfig * readConfig(co
1280      line->elements[line->numElements - 1].indent;      line->elements[line->numElements - 1].indent;
1281      line->elements[1].item = buf;      line->elements[1].item = buf;
1282      line->numElements = 2;      line->numElements = 2;
1283     } else if (line->type == LT_MENUENTRY && line->numElements > 3) {
1284        /* let --remove-kernel="TITLE=what" work */
1285        len = 0;
1286        char *extras;
1287        char *title;
1288        /* initially unseen value */
1289        char quote_char = '\0';
1290    
1291        for (int i = 1; i < line->numElements; i++) {
1292     len += strlen(line->elements[i].item);
1293     len += strlen(line->elements[i].indent);
1294        }
1295        buf = malloc(len + 1);
1296        *buf = '\0';
1297    
1298        /* allocate mem for extra flags. */
1299        extras = malloc(len + 1);
1300        *extras = '\0';
1301    
1302        /* get title. */
1303        for (int i = 0; i < line->numElements; i++) {
1304     if (!strcmp(line->elements[i].item, "menuentry"))
1305        continue;
1306     if (isquote(*line->elements[i].item) && quote_char == '\0') {
1307        /* ensure we properly pair off quotes */
1308        quote_char = *line->elements[i].item;
1309        title = line->elements[i].item + 1;
1310     } else {
1311        title = line->elements[i].item;
1312     }
1313    
1314     len = strlen(title);
1315            if (title[len-1] == quote_char) {
1316        strncat(buf, title,len-1);
1317        break;
1318     } else {
1319        strcat(buf, title);
1320        strcat(buf, line->elements[i].indent);
1321     }
1322        }
1323    
1324        /* get extras */
1325        int count = 0;
1326        quote_char = '\0';
1327        for (int i = 0; i < line->numElements; i++) {
1328     if (count >= 2) {
1329        strcat(extras, line->elements[i].item);
1330        strcat(extras, line->elements[i].indent);
1331     }
1332    
1333     if (!strcmp(line->elements[i].item, "menuentry"))
1334        continue;
1335    
1336     /* count ' or ", there should be two in menuentry line. */
1337     if (isquote(*line->elements[i].item) && quote_char == '\0') {
1338        /* ensure we properly pair off quotes */
1339                quote_char = *line->elements[i].item;
1340        count++;
1341     }
1342    
1343     len = strlen(line->elements[i].item);
1344    
1345     if (line->elements[i].item[len -1] == quote_char)
1346        count++;
1347    
1348     /* ok, we get the final ' or ", others are extras. */
1349                }
1350        line->elements[1].indent =
1351     line->elements[line->numElements - 2].indent;
1352        line->elements[1].item = buf;
1353        line->elements[2].indent =
1354     line->elements[line->numElements - 2].indent;
1355        line->elements[2].item = extras;
1356        line->numElements = 3;
1357   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {
1358      /* Strip off any " which may be present; they'll be put back      /* Strip off any " which may be present; they'll be put back
1359         on write. This is one of the few (the only?) places that grubby         on write. This is one of the few (the only?) places that grubby
# Line 887  static struct grubConfig * readConfig(co Line 1362  static struct grubConfig * readConfig(co
1362      if (line->numElements >= 2) {      if (line->numElements >= 2) {
1363   int last, len;   int last, len;
1364    
1365   if (*line->elements[1].item == '"')   if (isquote(*line->elements[1].item))
1366      memmove(line->elements[1].item, line->elements[1].item + 1,      memmove(line->elements[1].item, line->elements[1].item + 1,
1367      strlen(line->elements[1].item + 1) + 1);      strlen(line->elements[1].item + 1) + 1);
1368    
1369   last = line->numElements - 1;   last = line->numElements - 1;
1370   len = strlen(line->elements[last].item) - 1;   len = strlen(line->elements[last].item) - 1;
1371   if (line->elements[last].item[len] == '"')   if (isquote(line->elements[last].item[len]))
1372      line->elements[last].item[len] = '\0';      line->elements[last].item[len] = '\0';
1373      }      }
1374   }   }
1375    
1376     if (line->type == LT_DEFAULT && line->numElements == 2) {
1377        cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
1378        defaultLine = line;
1379     }
1380    
1381   /* If we find a generic config option which should live at the   /* If we find a generic config option which should live at the
1382     top of the file, move it there. Old versions of grubby were     top of the file, move it there. Old versions of grubby were
1383     probably responsible for putting new images in the wrong     probably responsible for putting new images in the wrong
# Line 931  static struct grubConfig * readConfig(co Line 1411  static struct grubConfig * readConfig(co
1411   entry->lines = line;   entry->lines = line;
1412      else      else
1413   last->next = line;   last->next = line;
1414      dbgPrintf("readConfig added %d to %p\n", line->type, entry);      dbgPrintf("readConfig added %s to %p\n", getKeyByType(line->type, cfi), entry);
1415    
1416        /* we could have seen this outside of an entry... if so, we
1417         * ignore it like any other line we don't grok */
1418        if (line->type == LT_ENTRY_END && sawEntry)
1419     sawEntry = 0;
1420   } else {   } else {
1421      if (!cfg->theLines)      if (!cfg->theLines)
1422   cfg->theLines = line;   cfg->theLines = line;
1423      else      else
1424   last->next = line;   last->next = line;
1425      dbgPrintf("readConfig added %d to cfg\n", line->type);      dbgPrintf("readConfig added %s to cfg\n", getKeyByType(line->type, cfi));
1426   }   }
1427    
1428   last = line;   last = line;
# Line 945  static struct grubConfig * readConfig(co Line 1430  static struct grubConfig * readConfig(co
1430    
1431      free(incoming);      free(incoming);
1432    
1433        dbgPrintf("defaultLine is %s\n", defaultLine ? "set" : "unset");
1434      if (defaultLine) {      if (defaultLine) {
1435   if (cfi->defaultSupportSaved &&          if (defaultLine->numElements > 2 &&
1436        cfi->defaultSupportSaved &&
1437        !strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {
1438     cfg->cfi->defaultIsSaved = 1;
1439     cfg->defaultImage = DEFAULT_SAVED_GRUB2;
1440     if (cfg->cfi->getEnv) {
1441        char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
1442        if (defTitle) {
1443     int index = 0;
1444     if (isnumber(defTitle)) {
1445        index = atoi(defTitle);
1446        entry = findEntryByIndex(cfg, index);
1447     } else {
1448        entry = findEntryByTitle(cfg, defTitle, &index);
1449     }
1450     if (entry)
1451        cfg->defaultImage = index;
1452        }
1453     }
1454     } else if (cfi->defaultIsVariable) {
1455        char *value = defaultLine->elements[2].item;
1456        while (*value && (*value == '"' || *value == '\'' ||
1457        *value == ' ' || *value == '\t'))
1458     value++;
1459        cfg->defaultImage = strtol(value, &end, 10);
1460        while (*end && (*end == '"' || *end == '\'' ||
1461        *end == ' ' || *end == '\t'))
1462     end++;
1463        if (*end) cfg->defaultImage = -1;
1464     } else if (cfi->defaultSupportSaved &&
1465   !strncmp(defaultLine->elements[1].item, "saved", 5)) {   !strncmp(defaultLine->elements[1].item, "saved", 5)) {
1466      cfg->defaultImage = DEFAULT_SAVED;      cfg->defaultImage = DEFAULT_SAVED;
1467   } else if (cfi->defaultIsIndex) {   } else if (cfi->defaultIsIndex) {
1468      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);
1469      if (*end) cfg->defaultImage = -1;      if (*end) cfg->defaultImage = -1;
1470   } else if (defaultLine->numElements >= 2) {   } else if (defaultLine->numElements >= 2) {
1471      i = 0;      int i = 0;
1472      while ((entry = findEntryByIndex(cfg, i))) {      while ((entry = findEntryByIndex(cfg, i))) {
1473   for (line = entry->lines; line; line = line->next)   for (line = entry->lines; line; line = line->next)
1474      if (line->type == LT_TITLE) break;      if (line->type == LT_TITLE) break;
# Line 964  static struct grubConfig * readConfig(co Line 1479  static struct grubConfig * readConfig(co
1479                                  line->elements[1].item)) break;                                  line->elements[1].item)) break;
1480                  } else if (line) {                  } else if (line) {
1481                      if (!strcmp(defaultLine->elements[1].item,                      if (!strcmp(defaultLine->elements[1].item,
1482                                  extractTitle(line))) break;                                  extractTitle(cfg, line))) break;
1483                  }                  }
1484   i++;   i++;
1485   entry = NULL;   entry = NULL;
# Line 976  static struct grubConfig * readConfig(co Line 1491  static struct grubConfig * readConfig(co
1491          cfg->defaultImage = -1;          cfg->defaultImage = -1;
1492      }      }
1493   }   }
1494        } else if (cfg->cfi->defaultIsSaved && cfg->cfi->getEnv) {
1495     char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
1496     if (defTitle) {
1497        int index = 0;
1498        if (isnumber(defTitle)) {
1499     index = atoi(defTitle);
1500     entry = findEntryByIndex(cfg, index);
1501        } else {
1502     entry = findEntryByTitle(cfg, defTitle, &index);
1503        }
1504        if (entry)
1505     cfg->defaultImage = index;
1506     }
1507      } else {      } else {
1508          cfg->defaultImage = 0;          cfg->defaultImage = 0;
1509      }      }
# Line 983  static struct grubConfig * readConfig(co Line 1511  static struct grubConfig * readConfig(co
1511      return cfg;      return cfg;
1512  }  }
1513    
1514  static void writeDefault(FILE * out, char * indent,  static void writeDefault(FILE * out, char * indent,
1515   char * separator, struct grubConfig * cfg) {   char * separator, struct grubConfig * cfg) {
1516      struct singleEntry * entry;      struct singleEntry * entry;
1517      struct singleLine * line;      struct singleLine * line;
1518      int i;      int i;
1519    
1520      if (!cfg->defaultImage && cfg->flags == GRUB_CONFIG_NO_DEFAULT) return;      if (!cfg->defaultImage && cfg->flags == GRUB_CONFIG_NO_DEFAULT)
1521     return;
1522    
1523      if (cfg->defaultImage == DEFAULT_SAVED)      if (cfg->defaultImage == DEFAULT_SAVED)
1524   fprintf(out, "%sdefault%ssaved\n", indent, separator);   fprintf(out, "%sdefault%ssaved\n", indent, separator);
1525      else if (cfg->defaultImage > -1) {      else if (cfg->cfi->defaultIsSaved) {
1526     fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
1527     if (cfg->defaultImage >= 0 && cfg->cfi->setEnv) {
1528        char *title;
1529        entry = findEntryByIndex(cfg, cfg->defaultImage);
1530        line = getLineByType(LT_MENUENTRY, entry->lines);
1531        if (!line)
1532     line = getLineByType(LT_TITLE, entry->lines);
1533        if (line) {
1534     title = extractTitle(cfg, line);
1535     if (title)
1536        cfg->cfi->setEnv(cfg->cfi, "saved_entry", title);
1537        }
1538     }
1539        } else if (cfg->defaultImage > -1) {
1540   if (cfg->cfi->defaultIsIndex) {   if (cfg->cfi->defaultIsIndex) {
1541      fprintf(out, "%sdefault%s%d\n", indent, separator,      if (cfg->cfi->defaultIsVariable) {
1542      cfg->defaultImage);          fprintf(out, "%sset default=\"%d\"\n", indent,
1543     cfg->defaultImage);
1544        } else {
1545     fprintf(out, "%sdefault%s%d\n", indent, separator,
1546     cfg->defaultImage);
1547        }
1548   } else {   } else {
1549      int image = cfg->defaultImage;      int image = cfg->defaultImage;
1550    
1551      entry = cfg->entries;      entry = cfg->entries;
1552      while (entry && entry->skip) entry = entry->next;      while (entry && entry->skip)
1553     entry = entry->next;
1554    
1555      i = 0;      i = 0;
1556      while (entry && i < image) {      while (entry && i < image) {
1557   entry = entry->next;   entry = entry->next;
1558    
1559   while (entry && entry->skip) entry = entry->next;   while (entry && entry->skip)
1560        entry = entry->next;
1561   i++;   i++;
1562      }      }
1563    
1564      if (!entry) return;      if (!entry)
1565     return;
1566    
1567      line = getLineByType(LT_TITLE, entry->lines);      line = getLineByType(LT_TITLE, entry->lines);
1568    
1569      if (line && line->numElements >= 2)      if (line && line->numElements >= 2)
1570   fprintf(out, "%sdefault%s%s\n", indent, separator,   fprintf(out, "%sdefault%s%s\n", indent, separator,
1571   line->elements[1].item);   line->elements[1].item);
1572              else if (line && (line->numElements == 1) &&              else if (line && (line->numElements == 1) &&
1573                       cfg->cfi->titleBracketed) {                       cfg->cfi->titleBracketed) {
1574   fprintf(out, "%sdefault%s%s\n", indent, separator,   char *title = extractTitle(cfg, line);
1575                          extractTitle(line));   if (title) {
1576        fprintf(out, "%sdefault%s%s\n", indent, separator, title);
1577        free(title);
1578     }
1579              }              }
1580   }   }
1581      }      }
# Line 1048  static int writeConfig(struct grubConfig Line 1602  static int writeConfig(struct grubConfig
1602    
1603      /* most likely the symlink is relative, so change our      /* most likely the symlink is relative, so change our
1604         directory to the dir of the symlink */         directory to the dir of the symlink */
1605              rc = chdir(dirname(strdupa(outName)));      char *dir = strdupa(outName);
1606        rc = chdir(dirname(dir));
1607      do {      do {
1608   buf = alloca(len + 1);   buf = alloca(len + 1);
1609   rc = readlink(basename(outName), buf, len);   rc = readlink(basename(outName), buf, len);
# Line 1086  static int writeConfig(struct grubConfig Line 1641  static int writeConfig(struct grubConfig
1641      }      }
1642    
1643      line = cfg->theLines;      line = cfg->theLines;
1644        struct keywordTypes *defaultKw = getKeywordByType(LT_DEFAULT, cfg->cfi);
1645      while (line) {      while (line) {
1646   if (line->type == LT_DEFAULT) {          if (line->type == LT_SET_VARIABLE && defaultKw &&
1647     line->numElements == 3 &&
1648     !strcmp(line->elements[1].item, defaultKw->key) &&
1649     !is_special_grub2_variable(line->elements[2].item)) {
1650        writeDefault(out, line->indent, line->elements[0].indent, cfg);
1651        needs &= ~MAIN_DEFAULT;
1652     } else if (line->type == LT_DEFAULT) {
1653      writeDefault(out, line->indent, line->elements[0].indent, cfg);      writeDefault(out, line->indent, line->elements[0].indent, cfg);
1654      needs &= ~MAIN_DEFAULT;      needs &= ~MAIN_DEFAULT;
1655   } else if (line->type == LT_FALLBACK) {   } else if (line->type == LT_FALLBACK) {
# Line 1155  static int numEntries(struct grubConfig Line 1717  static int numEntries(struct grubConfig
1717      return i;      return i;
1718  }  }
1719    
1720    static char *findDiskForRoot()
1721    {
1722        int fd;
1723        char buf[65536];
1724        char *devname;
1725        char *chptr;
1726        int rc;
1727    
1728        if ((fd = open(_PATH_MOUNTED, O_RDONLY)) < 0) {
1729            fprintf(stderr, "grubby: failed to open %s: %s\n",
1730                    _PATH_MOUNTED, strerror(errno));
1731            return NULL;
1732        }
1733    
1734        rc = read(fd, buf, sizeof(buf) - 1);
1735        if (rc <= 0) {
1736            fprintf(stderr, "grubby: failed to read %s: %s\n",
1737                    _PATH_MOUNTED, strerror(errno));
1738            close(fd);
1739            return NULL;
1740        }
1741        close(fd);
1742        buf[rc] = '\0';
1743        chptr = buf;
1744    
1745        char *foundanswer = NULL;
1746    
1747        while (chptr && chptr != buf+rc) {
1748            devname = chptr;
1749    
1750            /*
1751             * The first column of a mtab entry is the device, but if the entry is a
1752             * special device it won't start with /, so move on to the next line.
1753             */
1754            if (*devname != '/') {
1755                chptr = strchr(chptr, '\n');
1756                if (chptr)
1757                    chptr++;
1758                continue;
1759            }
1760    
1761            /* Seek to the next space */
1762            chptr = strchr(chptr, ' ');
1763            if (!chptr) {
1764                fprintf(stderr, "grubby: error parsing %s: %s\n",
1765                        _PATH_MOUNTED, strerror(errno));
1766                return NULL;
1767            }
1768    
1769            /*
1770             * The second column of a mtab entry is the mount point, we are looking
1771             * for '/' obviously.
1772             */
1773            if (*(++chptr) == '/' && *(++chptr) == ' ') {
1774                /* remember the last / entry in mtab */
1775               foundanswer = devname;
1776            }
1777    
1778            /* Next line */
1779            chptr = strchr(chptr, '\n');
1780            if (chptr)
1781                chptr++;
1782        }
1783    
1784        /* Return the last / entry found */
1785        if (foundanswer) {
1786            chptr = strchr(foundanswer, ' ');
1787            *chptr = '\0';
1788            return strdup(foundanswer);
1789        }
1790    
1791        return NULL;
1792    }
1793    
1794    void printEntry(struct singleEntry * entry, FILE *f) {
1795        int i;
1796        struct singleLine * line;
1797    
1798        for (line = entry->lines; line; line = line->next) {
1799     log_message(f, "DBG: %s", line->indent);
1800     for (i = 0; i < line->numElements; i++) {
1801        /* Need to handle this, because we strip the quotes from
1802         * menuentry when read it. */
1803        if (line->type == LT_MENUENTRY && i == 1) {
1804     if(!isquote(*line->elements[i].item))
1805        log_message(f, "\'%s\'", line->elements[i].item);
1806     else
1807        log_message(f, "%s", line->elements[i].item);
1808     log_message(f, "%s", line->elements[i].indent);
1809    
1810     continue;
1811        }
1812        
1813        log_message(f, "%s%s",
1814        line->elements[i].item, line->elements[i].indent);
1815     }
1816     log_message(f, "\n");
1817        }
1818    }
1819    
1820    void notSuitablePrintf(struct singleEntry * entry, int okay, const char *fmt, ...)
1821    {
1822        static int once;
1823        va_list argp, argq;
1824    
1825        va_start(argp, fmt);
1826    
1827        va_copy(argq, argp);
1828        if (!once) {
1829     log_time(NULL);
1830     log_message(NULL, "command line: %s\n", saved_command_line);
1831        }
1832        log_message(NULL, "DBG: Image entry %s: ", okay ? "succeeded" : "failed");
1833        log_vmessage(NULL, fmt, argq);
1834    
1835        printEntry(entry, NULL);
1836        va_end(argq);
1837    
1838        if (!debug) {
1839     once = 1;
1840         va_end(argp);
1841     return;
1842        }
1843    
1844        if (okay) {
1845     va_end(argp);
1846     return;
1847        }
1848    
1849        if (!once)
1850     log_message(stderr, "DBG: command line: %s\n", saved_command_line);
1851        once = 1;
1852        fprintf(stderr, "DBG: Image entry failed: ");
1853        vfprintf(stderr, fmt, argp);
1854        printEntry(entry, stderr);
1855        va_end(argp);
1856    }
1857    
1858    #define beginswith(s, c) ((s) && (s)[0] == (c))
1859    
1860    static int endswith(const char *s, char c)
1861    {
1862     int slen;
1863    
1864     if (!s || !s[0])
1865     return 0;
1866     slen = strlen(s) - 1;
1867    
1868     return s[slen] == c;
1869    }
1870    
1871  int suitableImage(struct singleEntry * entry, const char * bootPrefix,  int suitableImage(struct singleEntry * entry, const char * bootPrefix,
1872    int skipRemoved, int flags) {    int skipRemoved, int flags) {
1873      struct singleLine * line;      struct singleLine * line;
1874      char * fullName;      char * fullName;
1875      int i;      int i;
     struct stat sb, sb2;  
1876      char * dev;      char * dev;
1877      char * rootspec;      char * rootspec;
1878        char * rootdev;
1879    
1880      if (skipRemoved && entry->skip) return 0;      if (skipRemoved && entry->skip) {
1881     notSuitablePrintf(entry, 0, "marked to skip\n");
1882     return 0;
1883        }
1884    
1885      line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);      line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
1886      if (!line || line->numElements < 2) return 0;      if (!line) {
1887     notSuitablePrintf(entry, 0, "no line found\n");
1888     return 0;
1889        }
1890        if (line->numElements < 2) {
1891     notSuitablePrintf(entry, 0, "line has only %d elements\n",
1892        line->numElements);
1893     return 0;
1894        }
1895    
1896      if (flags & GRUBBY_BADIMAGE_OKAY) return 1;      if (flags & GRUBBY_BADIMAGE_OKAY) {
1897        notSuitablePrintf(entry, 1, "\n");
1898        return 1;
1899        }
1900    
1901      fullName = alloca(strlen(bootPrefix) +      fullName = alloca(strlen(bootPrefix) +
1902        strlen(line->elements[1].item) + 1);        strlen(line->elements[1].item) + 1);
1903      rootspec = getRootSpecifier(line->elements[1].item);      rootspec = getRootSpecifier(line->elements[1].item);
1904      sprintf(fullName, "%s%s", bootPrefix,      int rootspec_offset = rootspec ? strlen(rootspec) : 0;
1905              line->elements[1].item + (rootspec ? strlen(rootspec) : 0));      int hasslash = endswith(bootPrefix, '/') ||
1906      if (access(fullName, R_OK)) return 0;       beginswith(line->elements[1].item + rootspec_offset, '/');
1907        sprintf(fullName, "%s%s%s", bootPrefix, hasslash ? "" : "/",
1908                line->elements[1].item + rootspec_offset);
1909        if (access(fullName, R_OK)) {
1910     notSuitablePrintf(entry, 0, "access to %s failed\n", fullName);
1911     return 0;
1912        }
1913      for (i = 2; i < line->numElements; i++)      for (i = 2; i < line->numElements; i++)
1914   if (!strncasecmp(line->elements[i].item, "root=", 5)) break;   if (!strncasecmp(line->elements[i].item, "root=", 5)) break;
1915      if (i < line->numElements) {      if (i < line->numElements) {
# Line 1195  int suitableImage(struct singleEntry * e Line 1927  int suitableImage(struct singleEntry * e
1927      line = getLineByType(LT_KERNELARGS|LT_MBMODULE, entry->lines);      line = getLineByType(LT_KERNELARGS|LT_MBMODULE, entry->lines);
1928    
1929              /* failed to find one */              /* failed to find one */
1930              if (!line) return 0;              if (!line) {
1931     notSuitablePrintf(entry, 0, "no line found\n");
1932     return 0;
1933                }
1934    
1935      for (i = 1; i < line->numElements; i++)      for (i = 1; i < line->numElements; i++)
1936          if (!strncasecmp(line->elements[i].item, "root=", 5)) break;          if (!strncasecmp(line->elements[i].item, "root=", 5)) break;
1937      if (i < line->numElements)      if (i < line->numElements)
1938          dev = line->elements[i].item + 5;          dev = line->elements[i].item + 5;
1939      else {      else {
1940     notSuitablePrintf(entry, 0, "no root= entry found\n");
1941   /* it failed too...  can't find root= */   /* it failed too...  can't find root= */
1942          return 0;          return 0;
1943              }              }
# Line 1209  int suitableImage(struct singleEntry * e Line 1945  int suitableImage(struct singleEntry * e
1945      }      }
1946    
1947      dev = getpathbyspec(dev);      dev = getpathbyspec(dev);
1948      if (!dev)      if (!getpathbyspec(dev)) {
1949            notSuitablePrintf(entry, 0, "can't find blkid entry for %s\n", dev);
1950          return 0;          return 0;
1951        } else
1952     dev = getpathbyspec(dev);
1953    
1954      i = stat(dev, &sb);      rootdev = findDiskForRoot();
1955      if (i)      if (!rootdev) {
1956            notSuitablePrintf(entry, 0, "can't find root device\n");
1957   return 0;   return 0;
1958        }
1959    
1960      stat("/", &sb2);      if (!getuuidbydev(rootdev) || !getuuidbydev(dev)) {
1961            notSuitablePrintf(entry, 0, "uuid missing: rootdev %s, dev %s\n",
1962     getuuidbydev(rootdev), getuuidbydev(dev));
1963            free(rootdev);
1964            return 0;
1965        }
1966    
1967      if (sb.st_rdev != sb2.st_dev)      if (strcmp(getuuidbydev(rootdev), getuuidbydev(dev))) {
1968            notSuitablePrintf(entry, 0, "uuid mismatch: rootdev %s, dev %s\n",
1969     getuuidbydev(rootdev), getuuidbydev(dev));
1970     free(rootdev);
1971          return 0;          return 0;
1972        }
1973    
1974        free(rootdev);
1975        notSuitablePrintf(entry, 1, "\n");
1976    
1977      return 1;      return 1;
1978  }  }
# Line 1253  struct singleEntry * findEntryByPath(str Line 2006  struct singleEntry * findEntryByPath(str
2006   }   }
2007    
2008   indexVars[i + 1] = -1;   indexVars[i + 1] = -1;
2009    
2010   i = 0;   i = 0;
2011   if (index) {   if (index) {
2012      while (i < *index) i++;      while (i < *index) {
2013      if (indexVars[i] == -1) return NULL;   i++;
2014     if (indexVars[i] == -1) return NULL;
2015        }
2016   }   }
2017    
2018   entry = findEntryByIndex(config, indexVars[i]);   entry = findEntryByIndex(config, indexVars[i]);
2019   if (!entry) return NULL;   if (!entry) return NULL;
2020    
2021   line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
2022   if (!line) return NULL;   if (!line) return NULL;
2023    
2024   if (index) *index = indexVars[i];   if (index) *index = indexVars[i];
# Line 1301  struct singleEntry * findEntryByPath(str Line 2056  struct singleEntry * findEntryByPath(str
2056    
2057   if (!strncmp(kernel, "TITLE=", 6)) {   if (!strncmp(kernel, "TITLE=", 6)) {
2058      prefix = "";      prefix = "";
2059      checkType = LT_TITLE;      checkType = LT_TITLE|LT_MENUENTRY;
2060      kernel += 6;      kernel += 6;
2061   }   }
2062    
# Line 1312  struct singleEntry * findEntryByPath(str Line 2067  struct singleEntry * findEntryByPath(str
2067    
2068      /* check all the lines matching checkType */      /* check all the lines matching checkType */
2069      for (line = entry->lines; line; line = line->next) {      for (line = entry->lines; line; line = line->next) {
2070   line = getLineByType(entry->multiboot && checkType == LT_KERNEL ?   enum lineType_e ct = checkType;
2071       LT_KERNEL|LT_MBMODULE|LT_HYPER :   if (entry->multiboot && checkType == LT_KERNEL)
2072       checkType, line);      ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER|LT_KERNEL_16;
2073   if (!line) break;  /* not found in this entry */   else if (checkType & LT_KERNEL)
2074        ct = checkType | LT_KERNEL_EFI | LT_KERNEL_16;
2075     line = getLineByType(ct, line);
2076     if (!line)
2077        break;  /* not found in this entry */
2078    
2079   if (line && line->numElements >= 2) {   if (line && line->type != LT_MENUENTRY &&
2080     line->numElements >= 2) {
2081      rootspec = getRootSpecifier(line->elements[1].item);      rootspec = getRootSpecifier(line->elements[1].item);
2082      if (!strcmp(line->elements[1].item +      if (!strcmp(line->elements[1].item +
2083   ((rootspec != NULL) ? strlen(rootspec) : 0),   ((rootspec != NULL) ? strlen(rootspec) : 0),
2084   kernel + strlen(prefix)))   kernel + strlen(prefix)))
2085   break;   break;
2086   }   }
2087     if(line->type == LT_MENUENTRY &&
2088     !strcmp(line->elements[1].item, kernel))
2089        break;
2090      }      }
2091    
2092      /* make sure this entry has a kernel identifier; this skips      /* make sure this entry has a kernel identifier; this skips
2093       * non-Linux boot entries (could find netbsd etc, though, which is       * non-Linux boot entries (could find netbsd etc, though, which is
2094       * unfortunate)       * unfortunate)
2095       */       */
2096      if (line && getLineByType(LT_KERNEL|LT_HYPER, entry->lines))      if (line && getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines))
2097   break; /* found 'im! */   break; /* found 'im! */
2098   }   }
2099    
# Line 1340  struct singleEntry * findEntryByPath(str Line 2103  struct singleEntry * findEntryByPath(str
2103      return entry;      return entry;
2104  }  }
2105    
2106    struct singleEntry * findEntryByTitle(struct grubConfig * cfg, char *title,
2107          int * index) {
2108        struct singleEntry * entry;
2109        struct singleLine * line;
2110        int i;
2111        char * newtitle;
2112    
2113        for (i = 0, entry = cfg->entries; entry; entry = entry->next, i++) {
2114     if (index && i < *index)
2115        continue;
2116     line = getLineByType(LT_TITLE, entry->lines);
2117     if (!line)
2118        line = getLineByType(LT_MENUENTRY, entry->lines);
2119     if (!line)
2120        continue;
2121     newtitle = grub2ExtractTitle(line);
2122     if (!newtitle)
2123        continue;
2124     if (!strcmp(title, newtitle))
2125        break;
2126        }
2127    
2128        if (!entry)
2129     return NULL;
2130    
2131        if (index)
2132     *index = i;
2133        return entry;
2134    }
2135    
2136  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index) {  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index) {
2137      struct singleEntry * entry;      struct singleEntry * entry;
2138    
# Line 1362  struct singleEntry * findTemplate(struct Line 2155  struct singleEntry * findTemplate(struct
2155      struct singleEntry * entry, * entry2;      struct singleEntry * entry, * entry2;
2156      int index;      int index;
2157    
2158      if (cfg->defaultImage > -1) {      if (cfg->cfi->defaultIsSaved) {
2159     if (cfg->cfi->getEnv) {
2160        char *defTitle = cfg->cfi->getEnv(cfg->cfi, "saved_entry");
2161        if (defTitle) {
2162     int index = 0;
2163     if (isnumber(defTitle)) {
2164        index = atoi(defTitle);
2165        entry = findEntryByIndex(cfg, index);
2166     } else {
2167        entry = findEntryByTitle(cfg, defTitle, &index);
2168     }
2169     if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
2170        cfg->defaultImage = index;
2171        if (indexPtr)
2172     *indexPtr = index;
2173        return entry;
2174     }
2175        }
2176     }
2177        } else if (cfg->defaultImage > -1) {
2178   entry = findEntryByIndex(cfg, cfg->defaultImage);   entry = findEntryByIndex(cfg, cfg->defaultImage);
2179   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
2180      if (indexPtr) *indexPtr = cfg->defaultImage;      if (indexPtr) *indexPtr = cfg->defaultImage;
# Line 1415  void markRemovedImage(struct grubConfig Line 2227  void markRemovedImage(struct grubConfig
2227        const char * prefix) {        const char * prefix) {
2228      struct singleEntry * entry;      struct singleEntry * entry;
2229    
2230      if (!image) return;      if (!image)
2231     return;
2232    
2233        /* check and see if we're removing the default image */
2234        if (isdigit(*image)) {
2235     entry = findEntryByPath(cfg, image, prefix, NULL);
2236     if(entry)
2237        entry->skip = 1;
2238     return;
2239        }
2240    
2241      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))
2242   entry->skip = 1;   entry->skip = 1;
# Line 1423  void markRemovedImage(struct grubConfig Line 2244  void markRemovedImage(struct grubConfig
2244    
2245  void setDefaultImage(struct grubConfig * config, int hasNew,  void setDefaultImage(struct grubConfig * config, int hasNew,
2246       const char * defaultKernelPath, int newIsDefault,       const char * defaultKernelPath, int newIsDefault,
2247       const char * prefix, int flags) {       const char * prefix, int flags, int index) {
2248      struct singleEntry * entry, * entry2, * newDefault;      struct singleEntry * entry, * entry2, * newDefault;
2249      int i, j;      int i, j;
2250    
2251      if (newIsDefault) {      if (newIsDefault) {
2252   config->defaultImage = 0;   config->defaultImage = 0;
2253   return;   return;
2254        } else if ((index >= 0) && config->cfi->defaultIsIndex) {
2255     if (findEntryByIndex(config, index))
2256        config->defaultImage = index;
2257     else
2258        config->defaultImage = -1;
2259     return;
2260      } else if (defaultKernelPath) {      } else if (defaultKernelPath) {
2261   i = 0;   i = 0;
2262   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {
# Line 1442  void setDefaultImage(struct grubConfig * Line 2269  void setDefaultImage(struct grubConfig *
2269    
2270      /* defaultImage now points to what we'd like to use, but before any order      /* defaultImage now points to what we'd like to use, but before any order
2271         changes */         changes */
2272      if (config->defaultImage == DEFAULT_SAVED)      if ((config->defaultImage == DEFAULT_SAVED) ||
2273     (config->defaultImage == DEFAULT_SAVED_GRUB2))
2274        /* default is set to saved, we don't want to change it */        /* default is set to saved, we don't want to change it */
2275        return;        return;
2276    
# Line 1500  void displayEntry(struct singleEntry * e Line 2328  void displayEntry(struct singleEntry * e
2328      struct singleLine * line;      struct singleLine * line;
2329      char * root = NULL;      char * root = NULL;
2330      int i;      int i;
2331        int j;
2332    
2333        printf("index=%d\n", index);
2334    
2335        line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
2336        if (!line) {
2337            printf("non linux entry\n");
2338            return;
2339        }
2340    
2341        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
2342     printf("kernel=%s\n", line->elements[1].item);
2343        else
2344     printf("kernel=%s%s\n", prefix, line->elements[1].item);
2345    
2346        if (line->numElements >= 3) {
2347     printf("args=\"");
2348     i = 2;
2349     while (i < line->numElements) {
2350        if (!strncmp(line->elements[i].item, "root=", 5)) {
2351     root = line->elements[i].item + 5;
2352        } else {
2353     printf("%s%s", line->elements[i].item,
2354           line->elements[i].indent);
2355        }
2356    
2357        i++;
2358     }
2359     printf("\"\n");
2360        } else {
2361     line = getLineByType(LT_KERNELARGS, entry->lines);
2362     if (line) {
2363        char * s;
2364    
2365        printf("args=\"");
2366        i = 1;
2367        while (i < line->numElements) {
2368     if (!strncmp(line->elements[i].item, "root=", 5)) {
2369        root = line->elements[i].item + 5;
2370     } else {
2371        s = line->elements[i].item;
2372    
2373        printf("%s%s", s, line->elements[i].indent);
2374     }
2375    
2376     i++;
2377        }
2378    
2379        s = line->elements[i - 1].indent;
2380        printf("\"\n");
2381     }
2382        }
2383    
2384        if (!root) {
2385     line = getLineByType(LT_ROOT, entry->lines);
2386     if (line && line->numElements >= 2)
2387        root=line->elements[1].item;
2388        }
2389    
2390        if (root) {
2391     char * s = alloca(strlen(root) + 1);
2392    
2393     strcpy(s, root);
2394     if (s[strlen(s) - 1] == '"')
2395        s[strlen(s) - 1] = '\0';
2396     /* make sure the root doesn't have a trailing " */
2397     printf("root=%s\n", s);
2398        }
2399    
2400        line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
2401    
2402        if (line && line->numElements >= 2) {
2403     if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
2404        printf("initrd=");
2405     else
2406        printf("initrd=%s", prefix);
2407    
2408     for (i = 1; i < line->numElements; i++)
2409        printf("%s%s", line->elements[i].item, line->elements[i].indent);
2410     printf("\n");
2411        }
2412    
2413        line = getLineByType(LT_TITLE, entry->lines);
2414        if (line) {
2415     printf("title=%s\n", line->elements[1].item);
2416        } else {
2417     char * title;
2418     line = getLineByType(LT_MENUENTRY, entry->lines);
2419     if (line) {
2420        title = grub2ExtractTitle(line);
2421        if (title)
2422     printf("title=%s\n", title);
2423     }
2424        }
2425    
2426        for (j = 0, line = entry->lines; line; line = line->next) {
2427     if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
2428        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
2429     printf("mbmodule%d=", j);
2430        else
2431     printf("mbmodule%d=%s", j, prefix);
2432    
2433        for (i = 1; i < line->numElements; i++)
2434     printf("%s%s", line->elements[i].item, line->elements[i].indent);
2435        printf("\n");
2436        j++;
2437     }
2438        }
2439    }
2440    
2441    int isSuseSystem(void) {
2442        const char * path;
2443        const static char default_path[] = "/etc/SuSE-release";
2444    
2445        if ((path = getenv("GRUBBY_SUSE_RELEASE")) == NULL)
2446     path = default_path;
2447    
2448        if (!access(path, R_OK))
2449     return 1;
2450        return 0;
2451    }
2452    
2453    int isSuseGrubConf(const char * path) {
2454        FILE * grubConf;
2455        char * line = NULL;
2456        size_t len = 0, res = 0;
2457    
2458        grubConf = fopen(path, "r");
2459        if (!grubConf) {
2460            dbgPrintf("Could not open SuSE configuration file '%s'\n", path);
2461     return 0;
2462        }
2463    
2464        while ((res = getline(&line, &len, grubConf)) != -1) {
2465     if (!strncmp(line, "setup", 5)) {
2466        fclose(grubConf);
2467        free(line);
2468        return 1;
2469     }
2470        }
2471    
2472        dbgPrintf("SuSE configuration file '%s' does not appear to be valid\n",
2473          path);
2474    
2475        fclose(grubConf);
2476        free(line);
2477        return 0;
2478    }
2479    
2480    int suseGrubConfGetLba(const char * path, int * lbaPtr) {
2481        FILE * grubConf;
2482        char * line = NULL;
2483        size_t res = 0, len = 0;
2484    
2485        if (!path) return 1;
2486        if (!lbaPtr) return 1;
2487    
2488        grubConf = fopen(path, "r");
2489        if (!grubConf) return 1;
2490    
2491        while ((res = getline(&line, &len, grubConf)) != -1) {
2492     if (line[res - 1] == '\n')
2493        line[res - 1] = '\0';
2494     else if (len > res)
2495        line[res] = '\0';
2496     else {
2497        line = realloc(line, res + 1);
2498        line[res] = '\0';
2499     }
2500    
2501     if (!strncmp(line, "setup", 5)) {
2502        if (strstr(line, "--force-lba")) {
2503            *lbaPtr = 1;
2504        } else {
2505            *lbaPtr = 0;
2506        }
2507        dbgPrintf("lba: %i\n", *lbaPtr);
2508        break;
2509     }
2510        }
2511    
2512        free(line);
2513        fclose(grubConf);
2514        return 0;
2515    }
2516    
2517    int suseGrubConfGetInstallDevice(const char * path, char ** devicePtr) {
2518        FILE * grubConf;
2519        char * line = NULL;
2520        size_t res = 0, len = 0;
2521        char * lastParamPtr = NULL;
2522        char * secLastParamPtr = NULL;
2523        char installDeviceNumber = '\0';
2524        char * bounds = NULL;
2525    
2526        if (!path) return 1;
2527        if (!devicePtr) return 1;
2528    
2529        grubConf = fopen(path, "r");
2530        if (!grubConf) return 1;
2531    
2532        while ((res = getline(&line, &len, grubConf)) != -1) {
2533     if (strncmp(line, "setup", 5))
2534        continue;
2535    
2536     if (line[res - 1] == '\n')
2537        line[res - 1] = '\0';
2538     else if (len > res)
2539        line[res] = '\0';
2540     else {
2541        line = realloc(line, res + 1);
2542        line[res] = '\0';
2543     }
2544    
2545     lastParamPtr = bounds = line + res;
2546    
2547     /* Last parameter in grub may be an optional IMAGE_DEVICE */
2548     while (!isspace(*lastParamPtr))
2549        lastParamPtr--;
2550     lastParamPtr++;
2551    
2552     secLastParamPtr = lastParamPtr - 2;
2553     dbgPrintf("lastParamPtr: %s\n", lastParamPtr);
2554    
2555     if (lastParamPtr + 3 > bounds) {
2556        dbgPrintf("lastParamPtr going over boundary");
2557        fclose(grubConf);
2558        free(line);
2559        return 1;
2560     }
2561     if (!strncmp(lastParamPtr, "(hd", 3))
2562        lastParamPtr += 3;
2563     dbgPrintf("lastParamPtr: %c\n", *lastParamPtr);
2564    
2565     /*
2566     * Second last parameter will decide wether last parameter is
2567     * an IMAGE_DEVICE or INSTALL_DEVICE
2568     */
2569     while (!isspace(*secLastParamPtr))
2570        secLastParamPtr--;
2571     secLastParamPtr++;
2572    
2573     if (secLastParamPtr + 3 > bounds) {
2574        dbgPrintf("secLastParamPtr going over boundary");
2575        fclose(grubConf);
2576        free(line);
2577        return 1;
2578     }
2579     dbgPrintf("secLastParamPtr: %s\n", secLastParamPtr);
2580     if (!strncmp(secLastParamPtr, "(hd", 3)) {
2581        secLastParamPtr += 3;
2582        dbgPrintf("secLastParamPtr: %c\n", *secLastParamPtr);
2583        installDeviceNumber = *secLastParamPtr;
2584     } else {
2585        installDeviceNumber = *lastParamPtr;
2586     }
2587    
2588     *devicePtr = malloc(6);
2589     snprintf(*devicePtr, 6, "(hd%c)", installDeviceNumber);
2590     dbgPrintf("installDeviceNumber: %c\n", installDeviceNumber);
2591     fclose(grubConf);
2592     free(line);
2593     return 0;
2594        }
2595    
2596        free(line);
2597        fclose(grubConf);
2598        return 1;
2599    }
2600    
2601    int grubGetBootFromDeviceMap(const char * device,
2602         char ** bootPtr) {
2603        FILE * deviceMap;
2604        char * line = NULL;
2605        size_t res = 0, len = 0;
2606        char * devicePtr;
2607        char * bounds = NULL;
2608        const char * path;
2609        const static char default_path[] = "/boot/grub/device.map";
2610    
2611        if (!device) return 1;
2612        if (!bootPtr) return 1;
2613    
2614        if ((path = getenv("GRUBBY_GRUB_DEVICE_MAP")) == NULL)
2615     path = default_path;
2616    
2617        dbgPrintf("opening grub device.map file from: %s\n", path);
2618        deviceMap = fopen(path, "r");
2619        if (!deviceMap)
2620     return 1;
2621    
2622        while ((res = getline(&line, &len, deviceMap)) != -1) {
2623            if (!strncmp(line, "#", 1))
2624        continue;
2625    
2626      printf("index=%d\n", index);   if (line[res - 1] == '\n')
2627        line[res - 1] = '\0';
2628     else if (len > res)
2629        line[res] = '\0';
2630     else {
2631        line = realloc(line, res + 1);
2632        line[res] = '\0';
2633     }
2634    
2635     devicePtr = line;
2636     bounds = line + res;
2637    
2638     while ((isspace(*line) && ((devicePtr + 1) <= bounds)))
2639        devicePtr++;
2640     dbgPrintf("device: %s\n", devicePtr);
2641    
2642     if (!strncmp(devicePtr, device, strlen(device))) {
2643        devicePtr += strlen(device);
2644        while (isspace(*devicePtr) && ((devicePtr + 1) <= bounds))
2645            devicePtr++;
2646    
2647      line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);      *bootPtr = strdup(devicePtr);
2648      if (!line) {      break;
2649          printf("non linux entry\n");   }
         return;  
2650      }      }
2651    
2652      printf("kernel=%s\n", line->elements[1].item);      free(line);
2653        fclose(deviceMap);
2654        return 0;
2655    }
2656    
2657      if (line->numElements >= 3) {  int suseGrubConfGetBoot(const char * path, char ** bootPtr) {
2658   printf("args=\"");      char * grubDevice;
  i = 2;  
  while (i < line->numElements) {  
     if (!strncmp(line->elements[i].item, "root=", 5)) {  
  root = line->elements[i].item + 5;  
     } else {  
  printf("%s%s", line->elements[i].item,  
        line->elements[i].indent);  
     }  
2659    
2660      i++;      if (suseGrubConfGetInstallDevice(path, &grubDevice))
2661   }   dbgPrintf("error looking for grub installation device\n");
2662   printf("\"\n");      else
2663      } else {   dbgPrintf("grubby installation device: %s\n", grubDevice);
  line = getLineByType(LT_KERNELARGS, entry->lines);  
  if (line) {  
     char * s;  
2664    
2665      printf("args=\"");      if (grubGetBootFromDeviceMap(grubDevice, bootPtr))
2666      i = 1;   dbgPrintf("error looking for grub boot device\n");
2667      while (i < line->numElements) {      else
2668   if (!strncmp(line->elements[i].item, "root=", 5)) {   dbgPrintf("grubby boot device: %s\n", *bootPtr);
     root = line->elements[i].item + 5;  
  } else {  
     s = line->elements[i].item;  
2669    
2670      printf("%s%s", s, line->elements[i].indent);      free(grubDevice);
2671   }      return 0;
2672    }
2673    
2674   i++;  int parseSuseGrubConf(int * lbaPtr, char ** bootPtr) {
2675      }      /*
2676         * This SuSE grub configuration file at this location is not your average
2677         * grub configuration file, but instead the grub commands used to setup
2678         * grub on that system.
2679         */
2680        const char * path;
2681        const static char default_path[] = "/etc/grub.conf";
2682    
2683      s = line->elements[i - 1].indent;      if ((path = getenv("GRUBBY_SUSE_GRUB_CONF")) == NULL)
2684      printf("\"\n");   path = default_path;
  }  
     }  
2685    
2686      if (!root) {      if (!isSuseGrubConf(path)) return 1;
  line = getLineByType(LT_ROOT, entry->lines);  
  if (line && line->numElements >= 2)  
     root=line->elements[1].item;  
     }  
2687    
2688      if (root) {      if (lbaPtr) {
2689   char * s = alloca(strlen(root) + 1);          *lbaPtr = 0;
2690            if (suseGrubConfGetLba(path, lbaPtr))
2691   strcpy(s, root);              return 1;
  if (s[strlen(s) - 1] == '"')  
     s[strlen(s) - 1] = '\0';  
  /* make sure the root doesn't have a trailing " */  
  printf("root=%s\n", s);  
2692      }      }
2693    
2694      line = getLineByType(LT_INITRD, entry->lines);      if (bootPtr) {
2695            *bootPtr = NULL;
2696      if (line && line->numElements >= 2) {          suseGrubConfGetBoot(path, bootPtr);
  printf("initrd=%s", prefix);  
  for (i = 1; i < line->numElements; i++)  
     printf("%s%s", line->elements[i].item, line->elements[i].indent);  
  printf("\n");  
2697      }      }
2698    
2699        return 0;
2700  }  }
2701    
2702  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {
# Line 1623  int parseSysconfigGrub(int * lbaPtr, cha Line 2747  int parseSysconfigGrub(int * lbaPtr, cha
2747  }  }
2748    
2749  void dumpSysconfigGrub(void) {  void dumpSysconfigGrub(void) {
2750      char * boot;      char * boot = NULL;
2751      int lba;      int lba;
2752    
2753      if (!parseSysconfigGrub(&lba, &boot)) {      if (isSuseSystem()) {
2754   if (lba) printf("lba\n");          if (parseSuseGrubConf(&lba, &boot)) {
2755   if (boot) printf("boot=%s\n", boot);      free(boot);
2756        return;
2757     }
2758        } else {
2759            if (parseSysconfigGrub(&lba, &boot)) {
2760        free(boot);
2761        return;
2762     }
2763        }
2764    
2765        if (lba) printf("lba\n");
2766        if (boot) {
2767     printf("boot=%s\n", boot);
2768     free(boot);
2769      }      }
2770  }  }
2771    
# Line 1677  struct singleLine * addLineTmpl(struct s Line 2814  struct singleLine * addLineTmpl(struct s
2814  {  {
2815      struct singleLine * newLine = lineDup(tmplLine);      struct singleLine * newLine = lineDup(tmplLine);
2816    
2817        if (isEfi && cfi == &grub2ConfigType) {
2818     enum lineType_e old = newLine->type;
2819     newLine->type = preferredLineType(newLine->type, cfi);
2820     if (old != newLine->type)
2821        newLine->elements[0].item = getKeyByType(newLine->type, cfi);
2822        }
2823    
2824      if (val) {      if (val) {
2825   /* override the inherited value with our own.   /* override the inherited value with our own.
2826   * This is a little weak because it only applies to elements[1]   * This is a little weak because it only applies to elements[1]
# Line 1686  struct singleLine * addLineTmpl(struct s Line 2830  struct singleLine * addLineTmpl(struct s
2830   insertElement(newLine, val, 1, cfi);   insertElement(newLine, val, 1, cfi);
2831    
2832   /* but try to keep the rootspec from the template... sigh */   /* but try to keep the rootspec from the template... sigh */
2833   if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD)) {   if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD|LT_KERNEL_EFI|LT_INITRD_EFI|LT_KERNEL_16|LT_INITRD_16)) {
2834      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);
2835      if (rootspec != NULL) {      if (rootspec != NULL) {
2836   free(newLine->elements[1].item);   free(newLine->elements[1].item);
# Line 1723  struct singleLine *  addLine(struct sing Line 2867  struct singleLine *  addLine(struct sing
2867      /* NB: This function shouldn't allocate items on the heap, rather on the      /* NB: This function shouldn't allocate items on the heap, rather on the
2868       * stack since it calls addLineTmpl which will make copies.       * stack since it calls addLineTmpl which will make copies.
2869       */       */
   
2870      if (type == LT_TITLE && cfi->titleBracketed) {      if (type == LT_TITLE && cfi->titleBracketed) {
2871   /* we're doing a bracketed title (zipl) */   /* we're doing a bracketed title (zipl) */
2872   tmpl.type = type;   tmpl.type = type;
# Line 1733  struct singleLine *  addLine(struct sing Line 2876  struct singleLine *  addLine(struct sing
2876   sprintf(tmpl.elements[0].item, "[%s]", val);   sprintf(tmpl.elements[0].item, "[%s]", val);
2877   tmpl.elements[0].indent = "";   tmpl.elements[0].indent = "";
2878   val = NULL;   val = NULL;
2879        } else if (type == LT_MENUENTRY) {
2880     char *lineend = "--class gnu-linux --class gnu --class os {";
2881     if (!val) {
2882        fprintf(stderr, "Line type LT_MENUENTRY requires a value\n");
2883        abort();
2884     }
2885     kw = getKeywordByType(type, cfi);
2886     if (!kw) {
2887        fprintf(stderr, "Looking up keyword for unknown type %d\n", type);
2888        abort();
2889     }
2890     tmpl.indent = "";
2891     tmpl.type = type;
2892     tmpl.numElements = 3;
2893     tmpl.elements = alloca(sizeof(*tmpl.elements) * tmpl.numElements);
2894     tmpl.elements[0].item = kw->key;
2895     tmpl.elements[0].indent = alloca(2);
2896     sprintf(tmpl.elements[0].indent, "%c", kw->nextChar);
2897     tmpl.elements[1].item = (char *)val;
2898     tmpl.elements[1].indent = alloca(2);
2899     sprintf(tmpl.elements[1].indent, "%c", kw->nextChar);
2900     tmpl.elements[2].item = alloca(strlen(lineend)+1);
2901     strcpy(tmpl.elements[2].item, lineend);
2902     tmpl.elements[2].indent = "";
2903      } else {      } else {
2904   kw = getKeywordByType(type, cfi);   kw = getKeywordByType(type, cfi);
2905   if (!kw) abort();   if (!kw) {
2906        fprintf(stderr, "Looking up keyword for unknown type %d\n", type);
2907        abort();
2908     }
2909   tmpl.type = type;   tmpl.type = type;
2910   tmpl.numElements = val ? 2 : 1;   tmpl.numElements = val ? 2 : 1;
2911   tmpl.elements = alloca(sizeof(*tmpl.elements) * tmpl.numElements);   tmpl.elements = alloca(sizeof(*tmpl.elements) * tmpl.numElements);
# Line 1759  struct singleLine *  addLine(struct sing Line 2929  struct singleLine *  addLine(struct sing
2929   if (!line->next && !prev) prev = line;   if (!line->next && !prev) prev = line;
2930      }      }
2931    
2932      if (prev == entry->lines)      struct singleLine *menuEntry;
2933   tmpl.indent = defaultIndent ?: "";      menuEntry = getLineByType(LT_MENUENTRY, entry->lines);
2934      else      if (tmpl.type == LT_ENTRY_END) {
2935   tmpl.indent = prev->indent;   if (menuEntry)
2936        tmpl.indent = menuEntry->indent;
2937     else
2938        tmpl.indent = defaultIndent ?: "";
2939        } else if (tmpl.type != LT_MENUENTRY) {
2940     if (menuEntry)
2941        tmpl.indent = "\t";
2942     else if (prev == entry->lines)
2943        tmpl.indent = defaultIndent ?: "";
2944     else
2945        tmpl.indent = prev->indent;
2946        }
2947    
2948      return addLineTmpl(entry, &tmpl, prev, val, cfi);      return addLineTmpl(entry, &tmpl, prev, val, cfi);
2949  }  }
# Line 1789  void removeLine(struct singleEntry * ent Line 2970  void removeLine(struct singleEntry * ent
2970      free(line);      free(line);
2971  }  }
2972    
2973    static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)
2974    {
2975        struct singleLine newLine = {
2976     .indent = tmplLine->indent,
2977     .type = tmplLine->type,
2978     .next = tmplLine->next,
2979        };
2980        int firstQuotedItem = -1;
2981        int quoteLen = 0;
2982        int j;
2983        int element = 0;
2984        char *c;
2985    
2986        c = malloc(strlen(tmplLine->elements[0].item) + 1);
2987        strcpy(c, tmplLine->elements[0].item);
2988        insertElement(&newLine, c, element++, cfi);
2989        free(c);
2990        c = NULL;
2991    
2992        for (j = 1; j < tmplLine->numElements; j++) {
2993     if (firstQuotedItem == -1) {
2994        quoteLen += strlen(tmplLine->elements[j].item);
2995        
2996        if (isquote(tmplLine->elements[j].item[0])) {
2997     firstQuotedItem = j;
2998            quoteLen += strlen(tmplLine->elements[j].indent);
2999        } else {
3000     c = malloc(quoteLen + 1);
3001     strcpy(c, tmplLine->elements[j].item);
3002     insertElement(&newLine, c, element++, cfi);
3003     free(c);
3004     quoteLen = 0;
3005        }
3006     } else {
3007        int itemlen = strlen(tmplLine->elements[j].item);
3008        quoteLen += itemlen;
3009        quoteLen += strlen(tmplLine->elements[j].indent);
3010        
3011        if (isquote(tmplLine->elements[j].item[itemlen - 1])) {
3012     c = malloc(quoteLen + 1);
3013     c[0] = '\0';
3014     for (int i = firstQuotedItem; i < j+1; i++) {
3015        strcat(c, tmplLine->elements[i].item);
3016        strcat(c, tmplLine->elements[i].indent);
3017     }
3018     insertElement(&newLine, c, element++, cfi);
3019     free(c);
3020    
3021     firstQuotedItem = -1;
3022     quoteLen = 0;
3023        }
3024     }
3025        }
3026        while (tmplLine->numElements)
3027     removeElement(tmplLine, 0);
3028        if (tmplLine->elements)
3029     free(tmplLine->elements);
3030    
3031        tmplLine->numElements = newLine.numElements;
3032        tmplLine->elements = newLine.elements;
3033    }
3034    
3035  static void insertElement(struct singleLine * line,  static void insertElement(struct singleLine * line,
3036    const char * item, int insertHere,    const char * item, int insertHere,
3037    struct configFileInfo * cfi)    struct configFileInfo * cfi)
# Line 1895  int updateActualImage(struct grubConfig Line 3138  int updateActualImage(struct grubConfig
3138      const char ** arg;      const char ** arg;
3139      int useKernelArgs, useRoot;      int useKernelArgs, useRoot;
3140      int firstElement;      int firstElement;
3141      int *usedElements, *usedArgs;      int *usedElements;
3142      int doreplace;      int doreplace;
3143    
3144      if (!image) return 0;      if (!image) return 0;
# Line 1930  int updateActualImage(struct grubConfig Line 3173  int updateActualImage(struct grubConfig
3173      useRoot = (getKeywordByType(LT_ROOT, cfg->cfi)      useRoot = (getKeywordByType(LT_ROOT, cfg->cfi)
3174         && !multibootArgs);         && !multibootArgs);
3175    
     for (k = 0, arg = newArgs; *arg; arg++, k++) ;  
     usedArgs = calloc(k, sizeof(*usedArgs));  
   
3176      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
3177    
3178   if (multibootArgs && !entry->multiboot)   if (multibootArgs && !entry->multiboot)
# Line 1960  int updateActualImage(struct grubConfig Line 3200  int updateActualImage(struct grubConfig
3200      firstElement = 2;      firstElement = 2;
3201    
3202   } else {   } else {
3203      line = getLineByType(LT_KERNEL|LT_MBMODULE, entry->lines);      line = getLineByType(LT_KERNEL|LT_MBMODULE|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
3204      if (!line) {      if (!line) {
3205   /* no LT_KERNEL or LT_MBMODULE in this entry? */   /* no LT_KERNEL or LT_MBMODULE in this entry? */
3206   continue;   continue;
# Line 2008  int updateActualImage(struct grubConfig Line 3248  int updateActualImage(struct grubConfig
3248          usedElements = calloc(line->numElements, sizeof(*usedElements));          usedElements = calloc(line->numElements, sizeof(*usedElements));
3249    
3250   for (k = 0, arg = newArgs; *arg; arg++, k++) {   for (k = 0, arg = newArgs; *arg; arg++, k++) {
             if (usedArgs[k]) continue;  
3251    
3252      doreplace = 1;      doreplace = 1;
3253      for (i = firstElement; i < line->numElements; i++) {      for (i = firstElement; i < line->numElements; i++) {
# Line 2023  int updateActualImage(struct grubConfig Line 3262  int updateActualImage(struct grubConfig
3262                      continue;                      continue;
3263   if (!argMatch(line->elements[i].item, *arg)) {   if (!argMatch(line->elements[i].item, *arg)) {
3264                      usedElements[i]=1;                      usedElements[i]=1;
                     usedArgs[k]=1;  
3265      break;      break;
3266                  }                  }
3267              }              }
# Line 2093  int updateActualImage(struct grubConfig Line 3331  int updateActualImage(struct grubConfig
3331   }   }
3332      }      }
3333    
     free(usedArgs);  
3334      free(newArgs);      free(newArgs);
3335      free(oldArgs);      free(oldArgs);
3336    
# Line 2119  int updateImage(struct grubConfig * cfg, Line 3356  int updateImage(struct grubConfig * cfg,
3356      return rc;      return rc;
3357  }  }
3358    
3359    int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
3360     const char * image, const char * prefix, const char * initrd,
3361     const char * title) {
3362        struct singleEntry * entry;
3363        struct singleLine * line, * kernelLine, *endLine = NULL;
3364        int index = 0;
3365    
3366        if (!image) return 0;
3367    
3368        for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
3369            kernelLine = getLineByType(LT_MBMODULE, entry->lines);
3370            if (!kernelLine) continue;
3371    
3372     /* if title is supplied, the entry's title must match it. */
3373     if (title) {
3374        char *linetitle;
3375    
3376        line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
3377        if (!line)
3378     continue;
3379    
3380        linetitle = extractTitle(cfg, line);
3381        if (!linetitle)
3382     continue;
3383        if (strcmp(title, linetitle)) {
3384     free(linetitle);
3385     continue;
3386        }
3387        free(linetitle);
3388     }
3389    
3390            if (prefix) {
3391                int prefixLen = strlen(prefix);
3392                if (!strncmp(initrd, prefix, prefixLen))
3393                    initrd += prefixLen;
3394            }
3395     endLine = getLineByType(LT_ENTRY_END, entry->lines);
3396     if (endLine)
3397        removeLine(entry, endLine);
3398            line = addLine(entry, cfg->cfi, preferredLineType(LT_MBMODULE,cfg->cfi),
3399     kernelLine->indent, initrd);
3400            if (!line)
3401        return 1;
3402     if (endLine) {
3403        line = addLine(entry, cfg->cfi, LT_ENTRY_END, "", NULL);
3404                if (!line)
3405     return 1;
3406     }
3407    
3408            break;
3409        }
3410    
3411        return 0;
3412    }
3413    
3414    int updateInitrd(struct grubConfig * cfg, const char * image,
3415                     const char * prefix, const char * initrd, const char * title) {
3416        struct singleEntry * entry;
3417        struct singleLine * line, * kernelLine, *endLine = NULL;
3418        int index = 0;
3419    
3420        if (!image) return 0;
3421    
3422        for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
3423            kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
3424            if (!kernelLine) continue;
3425    
3426     /* if title is supplied, the entry's title must match it. */
3427     if (title) {
3428        char *linetitle;
3429    
3430        line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
3431        if (!line)
3432     continue;
3433    
3434        linetitle = extractTitle(cfg, line);
3435        if (!linetitle)
3436     continue;
3437        if (strcmp(title, linetitle)) {
3438     free(linetitle);
3439     continue;
3440        }
3441        free(linetitle);
3442     }
3443    
3444            line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
3445            if (line)
3446                removeLine(entry, line);
3447            if (prefix) {
3448                int prefixLen = strlen(prefix);
3449                if (!strncmp(initrd, prefix, prefixLen))
3450                    initrd += prefixLen;
3451            }
3452     endLine = getLineByType(LT_ENTRY_END, entry->lines);
3453     if (endLine)
3454        removeLine(entry, endLine);
3455     enum lineType_e lt;
3456     switch(kernelLine->type) {
3457        case LT_KERNEL:
3458            lt = LT_INITRD;
3459     break;
3460        case LT_KERNEL_EFI:
3461            lt = LT_INITRD_EFI;
3462     break;
3463        case LT_KERNEL_16:
3464            lt = LT_INITRD_16;
3465     break;
3466        default:
3467            lt = preferredLineType(LT_INITRD, cfg->cfi);
3468     }
3469            line = addLine(entry, cfg->cfi, lt, kernelLine->indent, initrd);
3470            if (!line)
3471        return 1;
3472     if (endLine) {
3473        line = addLine(entry, cfg->cfi, LT_ENTRY_END, "", NULL);
3474                if (!line)
3475     return 1;
3476     }
3477    
3478            break;
3479        }
3480    
3481        return 0;
3482    }
3483    
3484  int checkDeviceBootloader(const char * device, const unsigned char * boot) {  int checkDeviceBootloader(const char * device, const unsigned char * boot) {
3485      int fd;      int fd;
3486      unsigned char bootSect[512];      unsigned char bootSect[512];
# Line 2142  int checkDeviceBootloader(const char * d Line 3504  int checkDeviceBootloader(const char * d
3504      if (memcmp(boot, bootSect, 3))      if (memcmp(boot, bootSect, 3))
3505   return 0;   return 0;
3506    
3507      if (boot[1] == 0xeb) {      if (boot[1] == JMP_SHORT_OPCODE) {
3508   offset = boot[2] + 2;   offset = boot[2] + 2;
3509      } else if (boot[1] == 0xe8 || boot[1] == 0xe9) {      } else if (boot[1] == 0xe8 || boot[1] == 0xe9) {
3510   offset = (boot[3] << 8) + boot[2] + 2;   offset = (boot[3] << 8) + boot[2] + 2;
3511      } else if (boot[0] == 0xeb) {      } else if (boot[0] == JMP_SHORT_OPCODE) {
3512   offset = boot[1] + 2;        offset = boot[1] + 2;
3513            /*
3514     * it looks like grub, when copying stage1 into the mbr, patches stage1
3515     * right after the JMP location, replacing other instructions such as
3516     * JMPs for NOOPs. So, relax the check a little bit by skipping those
3517     * different bytes.
3518     */
3519          if ((bootSect[offset + 1] == NOOP_OPCODE)
3520      && (bootSect[offset + 2] == NOOP_OPCODE)) {
3521     offset = offset + 3;
3522          }
3523      } else if (boot[0] == 0xe8 || boot[0] == 0xe9) {      } else if (boot[0] == 0xe8 || boot[0] == 0xe9) {
3524   offset = (boot[2] << 8) + boot[1] + 2;   offset = (boot[2] << 8) + boot[1] + 2;
3525      } else {      } else {
# Line 2289  int checkForLilo(struct grubConfig * con Line 3661  int checkForLilo(struct grubConfig * con
3661      return checkDeviceBootloader(line->elements[1].item, boot);      return checkDeviceBootloader(line->elements[1].item, boot);
3662  }  }
3663    
3664    int checkForGrub2(struct grubConfig * config) {
3665        if (!access("/etc/grub.d/", R_OK))
3666     return 2;
3667    
3668        return 1;
3669    }
3670    
3671  int checkForGrub(struct grubConfig * config) {  int checkForGrub(struct grubConfig * config) {
3672      int fd;      int fd;
3673      unsigned char bootSect[512];      unsigned char bootSect[512];
3674      char * boot;      char * boot;
3675        int onSuse = isSuseSystem();
3676    
3677      if (parseSysconfigGrub(NULL, &boot))  
3678   return 0;      if (onSuse) {
3679     if (parseSuseGrubConf(NULL, &boot))
3680        return 0;
3681        } else {
3682     if (parseSysconfigGrub(NULL, &boot))
3683        return 0;
3684        }
3685    
3686      /* assume grub is not installed -- not an error condition */      /* assume grub is not installed -- not an error condition */
3687      if (!boot)      if (!boot)
# Line 2314  int checkForGrub(struct grubConfig * con Line 3700  int checkForGrub(struct grubConfig * con
3700      }      }
3701      close(fd);      close(fd);
3702    
3703        /* The more elaborate checks do not work on SuSE. The checks done
3704         * seem to be reasonble (at least for now), so just return success
3705         */
3706        if (onSuse)
3707     return 2;
3708    
3709      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
3710  }  }
3711    
# Line 2347  int checkForExtLinux(struct grubConfig * Line 3739  int checkForExtLinux(struct grubConfig *
3739      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
3740  }  }
3741    
3742    int checkForYaboot(struct grubConfig * config) {
3743        /*
3744         * This is a simplistic check that we consider good enough for own puporses
3745         *
3746         * If we were to properly check if yaboot is *installed* we'd need to:
3747         * 1) get the system boot device (LT_BOOT)
3748         * 2) considering it's a raw filesystem, check if the yaboot binary matches
3749         *    the content on the boot device
3750         * 3) if not, copy the binary to a temporary file and run "addnote" on it
3751         * 4) check again if binary and boot device contents match
3752         */
3753        if (!access("/etc/yaboot.conf", R_OK))
3754     return 2;
3755    
3756        return 1;
3757    }
3758    
3759    int checkForElilo(struct grubConfig * config) {
3760        if (!access("/etc/elilo.conf", R_OK))
3761     return 2;
3762    
3763        return 1;
3764    }
3765    
3766  static char * getRootSpecifier(char * str) {  static char * getRootSpecifier(char * str) {
3767      char * idx, * rootspec = NULL;      char * idx, * rootspec = NULL;
3768    
# Line 2361  static char * getRootSpecifier(char * st Line 3777  static char * getRootSpecifier(char * st
3777  static char * getInitrdVal(struct grubConfig * config,  static char * getInitrdVal(struct grubConfig * config,
3778     const char * prefix, struct singleLine *tmplLine,     const char * prefix, struct singleLine *tmplLine,
3779     const char * newKernelInitrd,     const char * newKernelInitrd,
3780     char ** extraInitrds, int extraInitrdCount)     const char ** extraInitrds, int extraInitrdCount)
3781  {  {
3782      char *initrdVal, *end;      char *initrdVal, *end;
3783      int i;      int i;
# Line 2406  static char * getInitrdVal(struct grubCo Line 3822  static char * getInitrdVal(struct grubCo
3822    
3823  int addNewKernel(struct grubConfig * config, struct singleEntry * template,  int addNewKernel(struct grubConfig * config, struct singleEntry * template,
3824           const char * prefix,           const char * prefix,
3825   char * newKernelPath, char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
3826   char * newKernelArgs, char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
3827   char ** extraInitrds, int extraInitrdCount,   const char ** extraInitrds, int extraInitrdCount,
3828                   char * newMBKernel, char * newMBKernelArgs) {                   const char * newMBKernel, const char * newMBKernelArgs,
3829     const char * newDevTreePath) {
3830      struct singleEntry * new;      struct singleEntry * new;
3831      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
3832      int needs;      int needs;
# Line 2450  int addNewKernel(struct grubConfig * con Line 3867  int addNewKernel(struct grubConfig * con
3867          needs |= NEED_MB;          needs |= NEED_MB;
3868          new->multiboot = 1;          new->multiboot = 1;
3869      }      }
3870        if (newDevTreePath && getKeywordByType(LT_DEVTREE, config->cfi))
3871     needs |= NEED_DEVTREE;
3872    
3873      if (template) {      if (template) {
3874   for (masterLine = template->lines;   for (masterLine = template->lines;
# Line 2463  int addNewKernel(struct grubConfig * con Line 3882  int addNewKernel(struct grubConfig * con
3882      while (*chptr && isspace(*chptr)) chptr++;      while (*chptr && isspace(*chptr)) chptr++;
3883      if (*chptr == '#') continue;      if (*chptr == '#') continue;
3884    
3885      if (tmplLine->type == LT_KERNEL &&      if (iskernel(tmplLine->type) && tmplLine->numElements >= 2) {
  tmplLine->numElements >= 2) {  
3886   if (!template->multiboot && (needs & NEED_MB)) {   if (!template->multiboot && (needs & NEED_MB)) {
3887      /* it's not a multiboot template and this is the kernel      /* it's not a multiboot template and this is the kernel
3888       * line.  Try to be intelligent about inserting the       * line.  Try to be intelligent about inserting the
# Line 2541  int addNewKernel(struct grubConfig * con Line 3959  int addNewKernel(struct grubConfig * con
3959      /* template is multi but new is not,      /* template is multi but new is not,
3960       * insert the kernel in the first module slot       * insert the kernel in the first module slot
3961       */       */
3962      tmplLine->type = LT_KERNEL;      tmplLine->type = preferredLineType(LT_KERNEL, config->cfi);
3963      free(tmplLine->elements[0].item);      free(tmplLine->elements[0].item);
3964      tmplLine->elements[0].item =      tmplLine->elements[0].item =
3965   strdup(getKeywordByType(LT_KERNEL, config->cfi)->key);   strdup(getKeywordByType(tmplLine->type,
3966     config->cfi)->key);
3967      newLine = addLineTmpl(new, tmplLine, newLine,      newLine = addLineTmpl(new, tmplLine, newLine,
3968    newKernelPath + strlen(prefix), config->cfi);    newKernelPath + strlen(prefix),
3969      config->cfi);
3970      needs &= ~NEED_KERNEL;      needs &= ~NEED_KERNEL;
3971   } else if (needs & NEED_INITRD) {   } else if (needs & NEED_INITRD) {
3972      char *initrdVal;      char *initrdVal;
3973      /* template is multi but new is not,      /* template is multi but new is not,
3974       * insert the initrd in the second module slot       * insert the initrd in the second module slot
3975       */       */
3976      tmplLine->type = LT_INITRD;      tmplLine->type = preferredLineType(LT_INITRD, config->cfi);
3977      free(tmplLine->elements[0].item);      free(tmplLine->elements[0].item);
3978      tmplLine->elements[0].item =      tmplLine->elements[0].item =
3979   strdup(getKeywordByType(LT_INITRD, config->cfi)->key);   strdup(getKeywordByType(tmplLine->type,
3980     config->cfi)->key);
3981      initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);      initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);
3982      newLine = addLineTmpl(new, tmplLine, newLine, initrdVal, config->cfi);      newLine = addLineTmpl(new, tmplLine, newLine, initrdVal, config->cfi);
3983      free(initrdVal);      free(initrdVal);
3984      needs &= ~NEED_INITRD;      needs &= ~NEED_INITRD;
3985   }   }
3986    
3987      } else if (tmplLine->type == LT_INITRD &&      } else if (isinitrd(tmplLine->type) && tmplLine->numElements >= 2) {
        tmplLine->numElements >= 2) {  
3988   if (needs & NEED_INITRD &&   if (needs & NEED_INITRD &&
3989      new->multiboot && !template->multiboot &&      new->multiboot && !template->multiboot &&
3990      config->cfi->mbInitRdIsModule) {      config->cfi->mbInitRdIsModule) {
# Line 2590  int addNewKernel(struct grubConfig * con Line 4010  int addNewKernel(struct grubConfig * con
4010      needs &= ~NEED_INITRD;      needs &= ~NEED_INITRD;
4011   }   }
4012    
4013        } else if (tmplLine->type == LT_MENUENTRY &&
4014           (needs & NEED_TITLE)) {
4015     requote(tmplLine, config->cfi);
4016     char *nkt = malloc(strlen(newKernelTitle)+3);
4017     strcpy(nkt, "'");
4018     strcat(nkt, newKernelTitle);
4019     strcat(nkt, "'");
4020     newLine = addLineTmpl(new, tmplLine, newLine, nkt, config->cfi);
4021     free(nkt);
4022     needs &= ~NEED_TITLE;
4023      } else if (tmplLine->type == LT_TITLE &&      } else if (tmplLine->type == LT_TITLE &&
4024         (needs & NEED_TITLE)) {         (needs & NEED_TITLE)) {
4025   if (tmplLine->numElements >= 2) {   if (tmplLine->numElements >= 2) {
# Line 2603  int addNewKernel(struct grubConfig * con Line 4033  int addNewKernel(struct grubConfig * con
4033        tmplLine->indent, newKernelTitle);        tmplLine->indent, newKernelTitle);
4034      needs &= ~NEED_TITLE;      needs &= ~NEED_TITLE;
4035   }   }
4036        } else if (tmplLine->type == LT_ECHO) {
4037        requote(tmplLine, config->cfi);
4038        static const char *prefix = "'Loading ";
4039        if (tmplLine->numElements > 1 &&
4040        strstr(tmplLine->elements[1].item, prefix) &&
4041        masterLine->next &&
4042        iskernel(masterLine->next->type)) {
4043     char *newTitle = malloc(strlen(prefix) +
4044     strlen(newKernelTitle) + 2);
4045    
4046     strcpy(newTitle, prefix);
4047     strcat(newTitle, newKernelTitle);
4048     strcat(newTitle, "'");
4049     newLine = addLine(new, config->cfi, LT_ECHO,
4050     tmplLine->indent, newTitle);
4051     free(newTitle);
4052        } else {
4053     /* pass through other lines from the template */
4054     newLine = addLineTmpl(new, tmplLine, newLine, NULL,
4055     config->cfi);
4056        }
4057        } else if (tmplLine->type == LT_DEVTREE &&
4058           tmplLine->numElements == 2 && newDevTreePath) {
4059            newLine = addLineTmpl(new, tmplLine, newLine,
4060          newDevTreePath + strlen(prefix),
4061          config->cfi);
4062     needs &= ~NEED_DEVTREE;
4063        } else if (tmplLine->type == LT_ENTRY_END && needs & NEED_DEVTREE) {
4064     const char *ndtp = newDevTreePath;
4065     if (!strncmp(newDevTreePath, prefix, strlen(prefix)))
4066        ndtp += strlen(prefix);
4067     newLine = addLine(new, config->cfi, LT_DEVTREE,
4068      config->secondaryIndent,
4069      ndtp);
4070     needs &= ~NEED_DEVTREE;
4071     newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
4072      } else {      } else {
4073   /* pass through other lines from the template */   /* pass through other lines from the template */
4074   newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);   newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
# Line 2614  int addNewKernel(struct grubConfig * con Line 4079  int addNewKernel(struct grubConfig * con
4079   /* don't have a template, so start the entry with the   /* don't have a template, so start the entry with the
4080   * appropriate starting line   * appropriate starting line
4081   */   */
4082   switch (config->cfi->entrySeparator) {   switch (config->cfi->entryStart) {
4083      case LT_KERNEL:      case LT_KERNEL:
4084        case LT_KERNEL_EFI:
4085        case LT_KERNEL_16:
4086   if (new->multiboot && config->cfi->mbHyperFirst) {   if (new->multiboot && config->cfi->mbHyperFirst) {
4087      /* fall through to LT_HYPER */      /* fall through to LT_HYPER */
4088   } else {   } else {
4089      newLine = addLine(new, config->cfi, LT_KERNEL,      newLine = addLine(new, config->cfi,
4090              preferredLineType(LT_KERNEL, config->cfi),
4091        config->primaryIndent,        config->primaryIndent,
4092        newKernelPath + strlen(prefix));        newKernelPath + strlen(prefix));
4093      needs &= ~NEED_KERNEL;      needs &= ~NEED_KERNEL;
# Line 2633  int addNewKernel(struct grubConfig * con Line 4101  int addNewKernel(struct grubConfig * con
4101   needs &= ~NEED_MB;   needs &= ~NEED_MB;
4102   break;   break;
4103    
4104        case LT_MENUENTRY: {
4105     char *nkt = malloc(strlen(newKernelTitle)+3);
4106     strcpy(nkt, "'");
4107     strcat(nkt, newKernelTitle);
4108     strcat(nkt, "'");
4109            newLine = addLine(new, config->cfi, LT_MENUENTRY,
4110      config->primaryIndent, nkt);
4111     free(nkt);
4112     needs &= ~NEED_TITLE;
4113     needs |= NEED_END;
4114     break;
4115        }
4116      case LT_TITLE:      case LT_TITLE:
4117   if( useextlinuxmenu != 0 ){ // We just need useextlinuxmenu to not be zero (set above)   if( useextlinuxmenu != 0 ){ // We just need useextlinuxmenu to not be zero (set above)
4118   char * templabel;   char * templabel;
# Line 2664  int addNewKernel(struct grubConfig * con Line 4144  int addNewKernel(struct grubConfig * con
4144   }   }
4145      }      }
4146    
4147        struct singleLine *endLine = NULL;
4148        endLine = getLineByType(LT_ENTRY_END, new->lines);
4149        if (endLine) {
4150        removeLine(new, endLine);
4151        needs |= NEED_END;
4152        }
4153    
4154      /* add the remainder of the lines, i.e. those that either      /* add the remainder of the lines, i.e. those that either
4155       * weren't present in the template, or in the case of no template,       * weren't present in the template, or in the case of no template,
4156       * all the lines following the entrySeparator.       * all the lines following the entryStart.
4157       */       */
4158      if (needs & NEED_TITLE) {      if (needs & NEED_TITLE) {
4159   newLine = addLine(new, config->cfi, LT_TITLE,   newLine = addLine(new, config->cfi, LT_TITLE,
# Line 2683  int addNewKernel(struct grubConfig * con Line 4170  int addNewKernel(struct grubConfig * con
4170      if (needs & NEED_KERNEL) {      if (needs & NEED_KERNEL) {
4171   newLine = addLine(new, config->cfi,   newLine = addLine(new, config->cfi,
4172    (new->multiboot && getKeywordByType(LT_MBMODULE,    (new->multiboot && getKeywordByType(LT_MBMODULE,
4173        config->cfi)) ?        config->cfi))
4174    LT_MBMODULE : LT_KERNEL,     ? LT_MBMODULE
4175     : preferredLineType(LT_KERNEL, config->cfi),
4176    config->secondaryIndent,    config->secondaryIndent,
4177    newKernelPath + strlen(prefix));    newKernelPath + strlen(prefix));
4178   needs &= ~NEED_KERNEL;   needs &= ~NEED_KERNEL;
# Line 2700  int addNewKernel(struct grubConfig * con Line 4188  int addNewKernel(struct grubConfig * con
4188   initrdVal = getInitrdVal(config, prefix, NULL, newKernelInitrd, extraInitrds, extraInitrdCount);   initrdVal = getInitrdVal(config, prefix, NULL, newKernelInitrd, extraInitrds, extraInitrdCount);
4189   newLine = addLine(new, config->cfi,   newLine = addLine(new, config->cfi,
4190    (new->multiboot && getKeywordByType(LT_MBMODULE,    (new->multiboot && getKeywordByType(LT_MBMODULE,
4191        config->cfi)) ?        config->cfi))
4192    LT_MBMODULE : LT_INITRD,     ? LT_MBMODULE
4193       : preferredLineType(LT_INITRD, config->cfi),
4194    config->secondaryIndent,    config->secondaryIndent,
4195    initrdVal);    initrdVal);
4196   free(initrdVal);   free(initrdVal);
4197   needs &= ~NEED_INITRD;   needs &= ~NEED_INITRD;
4198      }      }
4199        if (needs & NEED_DEVTREE) {
4200     newLine = addLine(new, config->cfi, LT_DEVTREE,
4201      config->secondaryIndent,
4202      newDevTreePath);
4203     needs &= ~NEED_DEVTREE;
4204        }
4205    
4206        /* NEEDS_END must be last on bootloaders that need it... */
4207        if (needs & NEED_END) {
4208     newLine = addLine(new, config->cfi, LT_ENTRY_END,
4209     config->secondaryIndent, NULL);
4210     needs &= ~NEED_END;
4211        }
4212    
4213      if (needs) {      if (needs) {
4214   printf(_("grubby: needs=%d, aborting\n"), needs);   printf(_("grubby: needs=%d, aborting\n"), needs);
# Line 2719  int addNewKernel(struct grubConfig * con Line 4221  int addNewKernel(struct grubConfig * con
4221      return 0;      return 0;
4222  }  }
4223    
 static void traceback(int signum)  
 {  
     void *array[40];  
     size_t size;  
   
     signal(SIGSEGV, SIG_DFL);  
     memset(array, '\0', sizeof (array));  
     size = backtrace(array, 40);  
   
     fprintf(stderr, "grubby recieved SIGSEGV!  Backtrace (%ld):\n",  
             (unsigned long)size);  
     backtrace_symbols_fd(array, size, STDERR_FILENO);  
     exit(1);  
 }  
   
4224  int main(int argc, const char ** argv) {  int main(int argc, const char ** argv) {
4225      poptContext optCon;      poptContext optCon;
4226      char * grubConfig = NULL;      const char * grubConfig = NULL;
4227      char * outputFile = NULL;      char * outputFile = NULL;
4228      int arg = 0;      int arg = 0;
4229      int flags = 0;      int flags = 0;
4230      int badImageOkay = 0;      int badImageOkay = 0;
4231        int configureGrub2 = 0;
4232      int configureLilo = 0, configureELilo = 0, configureGrub = 0;      int configureLilo = 0, configureELilo = 0, configureGrub = 0;
4233      int configureYaboot = 0, configureSilo = 0, configureZipl = 0;      int configureYaboot = 0, configureSilo = 0, configureZipl = 0;
4234      int configureExtLinux = 0;      int configureExtLinux = 0;
# Line 2752  int main(int argc, const char ** argv) { Line 4240  int main(int argc, const char ** argv) {
4240      char * newKernelArgs = NULL;      char * newKernelArgs = NULL;
4241      char * newKernelInitrd = NULL;      char * newKernelInitrd = NULL;
4242      char * newKernelTitle = NULL;      char * newKernelTitle = NULL;
4243      char * newKernelVersion = NULL;      char * newDevTreePath = NULL;
4244      char * newMBKernel = NULL;      char * newMBKernel = NULL;
4245      char * newMBKernelArgs = NULL;      char * newMBKernelArgs = NULL;
4246      char * removeMBKernelArgs = NULL;      char * removeMBKernelArgs = NULL;
# Line 2762  int main(int argc, const char ** argv) { Line 4250  int main(int argc, const char ** argv) {
4250      char * removeArgs = NULL;      char * removeArgs = NULL;
4251      char * kernelInfo = NULL;      char * kernelInfo = NULL;
4252      char * extraInitrds[MAX_EXTRA_INITRDS] = { NULL };      char * extraInitrds[MAX_EXTRA_INITRDS] = { NULL };
4253        char * envPath = NULL;
4254      const char * chptr = NULL;      const char * chptr = NULL;
4255      struct configFileInfo * cfi = NULL;      struct configFileInfo * cfi = NULL;
4256      struct grubConfig * config;      struct grubConfig * config;
4257      struct singleEntry * template = NULL;      struct singleEntry * template = NULL;
4258      int copyDefault = 0, makeDefault = 0;      int copyDefault = 0, makeDefault = 0;
4259      int displayDefault = 0;      int displayDefault = 0;
4260        int displayDefaultIndex = 0;
4261        int displayDefaultTitle = 0;
4262        int defaultIndex = -1;
4263      struct poptOption options[] = {      struct poptOption options[] = {
4264   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,
4265      _("add an entry for the specified kernel"), _("kernel-path") },      _("add an entry for the specified kernel"), _("kernel-path") },
# Line 2785  int main(int argc, const char ** argv) { Line 4277  int main(int argc, const char ** argv) {
4277   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
4278      _("filestystem which contains /boot directory (for testing only)"),      _("filestystem which contains /boot directory (for testing only)"),
4279      _("bootfs") },      _("bootfs") },
4280  #if defined(__i386__) || defined(__x86_64__)  #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
4281   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
4282      _("check if lilo is installed on lilo.conf boot sector") },      _("check which bootloader is installed on boot sector") },
4283  #endif  #endif
4284   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,
4285      _("path to grub config file to update (\"-\" for stdin)"),      _("path to grub config file to update (\"-\" for stdin)"),
# Line 2798  int main(int argc, const char ** argv) { Line 4290  int main(int argc, const char ** argv) {
4290        "the kernel referenced by the default image does not exist, "        "the kernel referenced by the default image does not exist, "
4291        "the first linux entry whose kernel does exist is used as the "        "the first linux entry whose kernel does exist is used as the "
4292        "template"), NULL },        "template"), NULL },
4293     { "debug", 0, 0, &debug, 0,
4294        _("print debugging information for failures") },
4295   { "default-kernel", 0, 0, &displayDefault, 0,   { "default-kernel", 0, 0, &displayDefault, 0,
4296      _("display the path of the default kernel") },      _("display the path of the default kernel") },
4297     { "default-index", 0, 0, &displayDefaultIndex, 0,
4298        _("display the index of the default kernel") },
4299     { "default-title", 0, 0, &displayDefaultTitle, 0,
4300        _("display the title of the default kernel") },
4301     { "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0,
4302        _("device tree file for new stanza"), _("dtb-path") },
4303     { "devtreedir", 0, POPT_ARG_STRING, &newDevTreePath, 0,
4304        _("device tree directory for new stanza"), _("dtb-path") },
4305   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
4306      _("configure elilo bootloader") },      _("configure elilo bootloader") },
4307     { "efi", 0, POPT_ARG_NONE, &isEfi, 0,
4308        _("force grub2 stanzas to use efi") },
4309     { "env", 0, POPT_ARG_STRING, &envPath, 0,
4310        _("path for environment data"),
4311        _("path") },
4312   { "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,   { "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,
4313      _("configure extlinux bootloader (from syslinux)") },      _("configure extlinux bootloader (from syslinux)") },
4314   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,
4315      _("configure grub bootloader") },      _("configure grub bootloader") },
4316     { "grub2", 0, POPT_ARG_NONE, &configureGrub2, 0,
4317        _("configure grub2 bootloader") },
4318   { "info", 0, POPT_ARG_STRING, &kernelInfo, 0,   { "info", 0, POPT_ARG_STRING, &kernelInfo, 0,
4319      _("display boot information for specified kernel"),      _("display boot information for specified kernel"),
4320      _("kernel-path") },      _("kernel-path") },
4321   { "initrd", 0, POPT_ARG_STRING, &newKernelInitrd, 0,   { "initrd", 0, POPT_ARG_STRING, &newKernelInitrd, 0,
4322      _("initrd image for the new kernel"), _("initrd-path") },      _("initrd image for the new kernel"), _("initrd-path") },
4323   { "extra-initrd", 'i', POPT_ARG_STRING, NULL, 'i',   { "extra-initrd", 'i', POPT_ARG_STRING, NULL, 'i',
4324      _("auxilliary initrd image for things other than the new kernel"), _("initrd-path") },      _("auxiliary initrd image for things other than the new kernel"), _("initrd-path") },
4325   { "lilo", 0, POPT_ARG_NONE, &configureLilo, 0,   { "lilo", 0, POPT_ARG_NONE, &configureLilo, 0,
4326      _("configure lilo bootloader") },      _("configure lilo bootloader") },
4327   { "make-default", 0, 0, &makeDefault, 0,   { "make-default", 0, 0, &makeDefault, 0,
# Line 2832  int main(int argc, const char ** argv) { Line 4341  int main(int argc, const char ** argv) {
4341   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,
4342      _("make the first entry referencing the specified kernel "      _("make the first entry referencing the specified kernel "
4343        "the default"), _("kernel-path") },        "the default"), _("kernel-path") },
4344     { "set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,
4345        _("make the given entry index the default entry"),
4346        _("entry-index") },
4347   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,
4348      _("configure silo bootloader") },      _("configure silo bootloader") },
4349   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,
# Line 2851  int main(int argc, const char ** argv) { Line 4363  int main(int argc, const char ** argv) {
4363    
4364      useextlinuxmenu=0;      useextlinuxmenu=0;
4365    
4366      signal(SIGSEGV, traceback);      int i = 0;
4367        for (int j = 1; j < argc; j++)
4368     i += strlen(argv[j]) + 1;
4369        saved_command_line = malloc(i);
4370        if (!saved_command_line) {
4371     fprintf(stderr, "grubby: %m\n");
4372     exit(1);
4373        }
4374        saved_command_line[0] = '\0';
4375        for (int j = 1; j < argc; j++) {
4376     strcat(saved_command_line, argv[j]);
4377     strncat(saved_command_line, j == argc -1 ? "" : " ", 1);
4378        }
4379    
4380      optCon = poptGetContext("grubby", argc, argv, options, 0);      optCon = poptGetContext("grubby", argc, argv, options, 0);
4381      poptReadDefaultConfig(optCon, 1);      poptReadDefaultConfig(optCon, 1);
# Line 2885  int main(int argc, const char ** argv) { Line 4409  int main(int argc, const char ** argv) {
4409   return 1;   return 1;
4410      }      }
4411    
4412      if ((configureLilo + configureGrub + configureELilo +      if ((configureLilo + configureGrub2 + configureGrub + configureELilo +
4413   configureYaboot + configureSilo + configureZipl +   configureYaboot + configureSilo + configureZipl +
4414   configureExtLinux ) > 1) {   configureExtLinux ) > 1) {
4415   fprintf(stderr, _("grubby: cannot specify multiple bootloaders\n"));   fprintf(stderr, _("grubby: cannot specify multiple bootloaders\n"));
# Line 2894  int main(int argc, const char ** argv) { Line 4418  int main(int argc, const char ** argv) {
4418   fprintf(stderr,   fprintf(stderr,
4419      _("grubby: cannot specify config file with --bootloader-probe\n"));      _("grubby: cannot specify config file with --bootloader-probe\n"));
4420   return 1;   return 1;
4421        } else if (configureGrub2) {
4422     cfi = &grub2ConfigType;
4423     if (envPath)
4424        cfi->envFile = envPath;
4425      } else if (configureLilo) {      } else if (configureLilo) {
4426   cfi = &liloConfigType;   cfi = &liloConfigType;
4427      } else if (configureGrub) {      } else if (configureGrub) {
# Line 2912  int main(int argc, const char ** argv) { Line 4440  int main(int argc, const char ** argv) {
4440      }      }
4441    
4442      if (!cfi) {      if (!cfi) {
4443            if (grub2FindConfig(&grub2ConfigType)) {
4444        cfi = &grub2ConfigType;
4445        if (envPath)
4446     cfi->envFile = envPath;
4447            } else
4448        #ifdef __ia64__        #ifdef __ia64__
4449   cfi = &eliloConfigType;      cfi = &eliloConfigType;
4450        #elif __powerpc__        #elif __powerpc__
4451   cfi = &yabootConfigType;      cfi = &yabootConfigType;
4452        #elif __sparc__        #elif __sparc__
4453          cfi = &siloConfigType;              cfi = &siloConfigType;
4454        #elif __s390__        #elif __s390__
4455          cfi = &ziplConfigType;              cfi = &ziplConfigType;
4456        #elif __s390x__        #elif __s390x__
4457          cfi = &ziplConfigtype;              cfi = &ziplConfigtype;
4458        #else        #else
4459   cfi = &grubConfigType;      cfi = &grubConfigType;
4460        #endif        #endif
4461      }      }
4462    
4463      if (!grubConfig)      if (!grubConfig) {
4464   grubConfig = cfi->defaultConfig;   if (cfi->findConfig)
4465        grubConfig = cfi->findConfig(cfi);
4466     if (!grubConfig)
4467        grubConfig = cfi->defaultConfig;
4468        }
4469    
4470      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo ||
4471    newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
4472    defaultKernel)) {      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
4473        (defaultIndex >= 0))) {
4474   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
4475    "specified option"));    "specified option"));
4476   return 1;   return 1;
4477      }      }
4478    
4479      if ((displayDefault || kernelInfo) && (newKernelVersion || newKernelPath ||      if ((displayDefault || kernelInfo) && (newKernelPath ||
4480     removeKernelPath)) {     removeKernelPath)) {
4481   fprintf(stderr, _("grubby: --default-kernel and --info may not "   fprintf(stderr, _("grubby: --default-kernel and --info may not "
4482    "be used when adding or removing kernels\n"));    "be used when adding or removing kernels\n"));
# Line 2948  int main(int argc, const char ** argv) { Line 4486  int main(int argc, const char ** argv) {
4486      if (newKernelPath && !newKernelTitle) {      if (newKernelPath && !newKernelTitle) {
4487   fprintf(stderr, _("grubby: kernel title must be specified\n"));   fprintf(stderr, _("grubby: kernel title must be specified\n"));
4488   return 1;   return 1;
4489      } else if (!newKernelPath && (newKernelTitle  || newKernelInitrd ||      } else if (!newKernelPath && (copyDefault ||
4490    newKernelInitrd || copyDefault     ||    (newKernelInitrd && !updateKernelPath)||
4491    makeDefault || extraInitrdCount > 0)) {    makeDefault || extraInitrdCount > 0)) {
4492   fprintf(stderr, _("grubby: kernel path expected\n"));   fprintf(stderr, _("grubby: kernel path expected\n"));
4493   return 1;   return 1;
# Line 2974  int main(int argc, const char ** argv) { Line 4512  int main(int argc, const char ** argv) {
4512   makeDefault = 1;   makeDefault = 1;
4513   defaultKernel = NULL;   defaultKernel = NULL;
4514      }      }
4515        else if (defaultKernel && (defaultIndex >= 0)) {
4516     fprintf(stderr, _("grubby: --set-default and --set-default-index "
4517      "may not be used together\n"));
4518     return 1;
4519        }
4520    
4521      if (!strcmp(grubConfig, "-") && !outputFile) {      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {
4522   fprintf(stderr, _("grubby: output file must be specified if stdin "   fprintf(stderr, _("grubby: output file must be specified if stdin "
4523   "is used\n"));   "is used\n"));
4524   return 1;   return 1;
4525      }      }
4526    
4527      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
4528   && !kernelInfo && !bootloaderProbe && !updateKernelPath   && !kernelInfo && !bootloaderProbe && !updateKernelPath
4529          && !removeMBKernel) {   && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle
4530     && (defaultIndex == -1)) {
4531   fprintf(stderr, _("grubby: no action specified\n"));   fprintf(stderr, _("grubby: no action specified\n"));
4532   return 1;   return 1;
4533      }      }
# Line 3010  int main(int argc, const char ** argv) { Line 4554  int main(int argc, const char ** argv) {
4554      }      }
4555    
4556      if (bootloaderProbe) {      if (bootloaderProbe) {
4557   int lrc = 0, grc = 0, erc = 0;   int lrc = 0, grc = 0, gr2c = 0, extrc = 0, yrc = 0, erc = 0;
4558   struct grubConfig * lconfig, * gconfig;   struct grubConfig * lconfig, * gconfig, * yconfig, * econfig;
4559    
4560     const char *grub2config = grub2FindConfig(&grub2ConfigType);
4561     if (grub2config) {
4562        gconfig = readConfig(grub2config, &grub2ConfigType);
4563        if (!gconfig)
4564     gr2c = 1;
4565        else
4566     gr2c = checkForGrub2(gconfig);
4567     }
4568    
4569   if (!access(grubConfigType.defaultConfig, F_OK)) {   const char *grubconfig = grubFindConfig(&grubConfigType);
4570      gconfig = readConfig(grubConfigType.defaultConfig, &grubConfigType);   if (!access(grubconfig, F_OK)) {
4571        gconfig = readConfig(grubconfig, &grubConfigType);
4572      if (!gconfig)      if (!gconfig)
4573   grc = 1;   grc = 1;
4574      else      else
# Line 3029  int main(int argc, const char ** argv) { Line 4583  int main(int argc, const char ** argv) {
4583   lrc = checkForLilo(lconfig);   lrc = checkForLilo(lconfig);
4584   }   }
4585    
4586     if (!access(eliloConfigType.defaultConfig, F_OK)) {
4587        econfig = readConfig(eliloConfigType.defaultConfig,
4588     &eliloConfigType);
4589        if (!econfig)
4590     erc = 1;
4591        else
4592     erc = checkForElilo(econfig);
4593     }
4594    
4595   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {
4596      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);
4597      if (!lconfig)      if (!lconfig)
4598   erc = 1;   extrc = 1;
4599      else      else
4600   erc = checkForExtLinux(lconfig);   extrc = checkForExtLinux(lconfig);
4601   }   }
4602    
4603   if (lrc == 1 || grc == 1) return 1;  
4604     if (!access(yabootConfigType.defaultConfig, F_OK)) {
4605        yconfig = readConfig(yabootConfigType.defaultConfig,
4606     &yabootConfigType);
4607        if (!yconfig)
4608     yrc = 1;
4609        else
4610     yrc = checkForYaboot(yconfig);
4611     }
4612    
4613     if (lrc == 1 || grc == 1 || gr2c == 1 || extrc == 1 || yrc == 1 ||
4614     erc == 1)
4615        return 1;
4616    
4617   if (lrc == 2) printf("lilo\n");   if (lrc == 2) printf("lilo\n");
4618     if (gr2c == 2) printf("grub2\n");
4619   if (grc == 2) printf("grub\n");   if (grc == 2) printf("grub\n");
4620   if (erc == 2) printf("extlinux\n");   if (extrc == 2) printf("extlinux\n");
4621     if (yrc == 2) printf("yaboot\n");
4622     if (erc == 2) printf("elilo\n");
4623    
4624   return 0;   return 0;
4625      }      }
4626    
4627        if (grubConfig == NULL) {
4628     printf("Could not find bootloader configuration file.\n");
4629     exit(1);
4630        }
4631    
4632      config = readConfig(grubConfig, cfi);      config = readConfig(grubConfig, cfi);
4633      if (!config) return 1;      if (!config) return 1;
4634    
# Line 3055  int main(int argc, const char ** argv) { Line 4638  int main(int argc, const char ** argv) {
4638          char * rootspec;          char * rootspec;
4639    
4640   if (config->defaultImage == -1) return 0;   if (config->defaultImage == -1) return 0;
4641     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
4642     cfi->defaultIsSaved)
4643        config->defaultImage = 0;
4644   entry = findEntryByIndex(config, config->defaultImage);   entry = findEntryByIndex(config, config->defaultImage);
4645   if (!entry) return 0;   if (!entry) return 0;
4646   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
4647    
4648   line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
4649   if (!line) return 0;   if (!line) return 0;
4650    
4651          rootspec = getRootSpecifier(line->elements[1].item);          rootspec = getRootSpecifier(line->elements[1].item);
# Line 3067  int main(int argc, const char ** argv) { Line 4653  int main(int argc, const char ** argv) {
4653                 ((rootspec != NULL) ? strlen(rootspec) : 0));                 ((rootspec != NULL) ? strlen(rootspec) : 0));
4654    
4655   return 0;   return 0;
4656    
4657        } else if (displayDefaultTitle) {
4658     struct singleLine * line;
4659     struct singleEntry * entry;
4660    
4661     if (config->defaultImage == -1)
4662        return 0;
4663     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
4664     cfi->defaultIsSaved)
4665        config->defaultImage = 0;
4666     entry = findEntryByIndex(config, config->defaultImage);
4667     if (!entry)
4668     return 0;
4669    
4670     if (!configureGrub2) {
4671        char *title;
4672        line = getLineByType(LT_TITLE, entry->lines);
4673        if (!line)
4674     return 0;
4675        title = extractTitle(config, line);
4676        if (!title)
4677     return 0;
4678        printf("%s\n", title);
4679        free(title);
4680     } else {
4681        char * title;
4682    
4683        dbgPrintf("This is GRUB2, default title is embeded in menuentry\n");
4684        line = getLineByType(LT_MENUENTRY, entry->lines);
4685        if (!line)
4686     return 0;
4687        title = grub2ExtractTitle(line);
4688        if (title)
4689     printf("%s\n", title);
4690     }
4691     return 0;
4692    
4693        } else if (displayDefaultIndex) {
4694            if (config->defaultImage == -1) return 0;
4695     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
4696     cfi->defaultIsSaved)
4697        config->defaultImage = 0;
4698            printf("%i\n", config->defaultImage);
4699            return 0;
4700    
4701      } else if (kernelInfo)      } else if (kernelInfo)
4702   return displayInfo(config, kernelInfo, bootPrefix);   return displayInfo(config, kernelInfo, bootPrefix);
4703    
# Line 3078  int main(int argc, const char ** argv) { Line 4709  int main(int argc, const char ** argv) {
4709      markRemovedImage(config, removeKernelPath, bootPrefix);      markRemovedImage(config, removeKernelPath, bootPrefix);
4710      markRemovedImage(config, removeMBKernel, bootPrefix);      markRemovedImage(config, removeMBKernel, bootPrefix);
4711      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,
4712      bootPrefix, flags);      bootPrefix, flags, defaultIndex);
4713      setFallbackImage(config, newKernelPath != NULL);      setFallbackImage(config, newKernelPath != NULL);
4714      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
4715                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
4716        if (updateKernelPath && newKernelInitrd) {
4717        if (newMBKernel) {
4718        if (addMBInitrd(config, newMBKernel, updateKernelPath,
4719     bootPrefix, newKernelInitrd,
4720     newKernelTitle))
4721        return 1;
4722        } else {
4723        if (updateInitrd(config, updateKernelPath, bootPrefix,
4724     newKernelInitrd, newKernelTitle))
4725     return 1;
4726        }
4727        }
4728      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
4729                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
4730                       extraInitrds, extraInitrdCount,                       (const char **)extraInitrds, extraInitrdCount,
4731                       newMBKernel, newMBKernelArgs)) return 1;                       newMBKernel, newMBKernelArgs, newDevTreePath)) return 1;
4732            
4733    
4734      if (numEntries(config) == 0) {      if (numEntries(config) == 0) {
# Line 3095  int main(int argc, const char ** argv) { Line 4738  int main(int argc, const char ** argv) {
4738      }      }
4739    
4740      if (!outputFile)      if (!outputFile)
4741   outputFile = grubConfig;   outputFile = (char *)grubConfig;
4742    
4743      return writeConfig(config, outputFile, bootPrefix);      return writeConfig(config, outputFile, bootPrefix);
4744  }  }

Legend:
Removed from v.926  
changed lines
  Added in v.2995