Magellan Linux

Diff of /tags/grubby-8_32/grubby.c

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

trunk/mkinitrd-magellan/grubby/grubby.c revision 532 by niro, Sat Sep 1 22:45:15 2007 UTC trunk/grubby/grubby.c revision 1849 by niro, Mon Jul 2 13:08:29 2012 UTC
# Line 1  Line 1 
1  /* Copyright (C) 2001-2005 Red Hat, Inc.  /*
2     * grubby.c
3     This program is free software; you can redistribute it and/or   *
4     modify it under the terms of the General Public License as published   * Copyright (C) 2001-2008 Red Hat, Inc.
5     by the Free Software Foundation; either version 2 of the License, or   * All rights reserved.
6     (at your option) any later version.   *
7     * This program is free software; you can redistribute it and/or modify
8     This program is distributed in the hope that it will be useful,   * it under the terms of the GNU General Public License as published by
9     but WITHOUT ANY WARRANTY; without even the implied warranty of   * the Free Software Foundation; either version 2 of the License, or
10     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU   * (at your option) any later version.
11     General Public License for more details.   *
12     * This program is distributed in the hope that it will be useful,
13     You should have received a copy of the GNU General Public   * but WITHOUT ANY WARRANTY; without even the implied warranty of
14     License along with this program; if not, write to the Free   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA   * GNU General Public License for more details.
16     02111-1307 USA.  */   *
17     * You should have received a copy of the GNU General Public License
18     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19     */
20    
21    #ifndef _GNU_SOURCE
22    #define _GNU_SOURCE
23    #endif
24  #include <ctype.h>  #include <ctype.h>
25  #include <errno.h>  #include <errno.h>
26  #include <fcntl.h>  #include <fcntl.h>
# Line 25  Line 31 
31  #include <string.h>  #include <string.h>
32  #include <sys/stat.h>  #include <sys/stat.h>
33  #include <unistd.h>  #include <unistd.h>
34    #include <libgen.h>
35    #include <execinfo.h>
36    #include <signal.h>
37    #include <blkid/blkid.h>
38    
39    #ifndef DEBUG
40    #define DEBUG 0
41    #endif
42    
43  #include "mount_by_label.h"  #if DEBUG
44    #define dbgPrintf(format, args...) fprintf(stderr, format , ## args)
45    #else
46    #define dbgPrintf(format, args...)
47    #endif
48    
49    int debug = 0; /* Currently just for template debugging */
50    
51  #define _(A) (A)  #define _(A) (A)
52    
53    #define MAX_EXTRA_INITRDS  16 /* code segment checked by --bootloader-probe */
54  #define CODE_SEG_SIZE  128 /* code segment checked by --bootloader-probe */  #define CODE_SEG_SIZE  128 /* code segment checked by --bootloader-probe */
55    
56    #define NOOP_OPCODE 0x90
57    #define JMP_SHORT_OPCODE 0xeb
58    
59  /* comments get lumped in with indention */  /* comments get lumped in with indention */
60  struct lineElement {  struct lineElement {
61      char * item;      char * item;
62      char * indent;      char * indent;
63  };  };
64    
65  enum lineType_e { LT_WHITESPACE, LT_TITLE, LT_KERNEL, LT_INITRD, LT_DEFAULT,  enum lineType_e {
66         LT_UNKNOWN, LT_ROOT, LT_FALLBACK, LT_KERNELARGS, LT_BOOT,      LT_WHITESPACE   = 1 << 0,
67         LT_BOOTROOT, LT_LBA, LT_MBMODULE, LT_OTHER, LT_GENERIC };      LT_TITLE        = 1 << 1,
68        LT_KERNEL       = 1 << 2,
69        LT_INITRD       = 1 << 3,
70        LT_HYPER        = 1 << 4,
71        LT_DEFAULT      = 1 << 5,
72        LT_MBMODULE     = 1 << 6,
73        LT_ROOT         = 1 << 7,
74        LT_FALLBACK     = 1 << 8,
75        LT_KERNELARGS   = 1 << 9,
76        LT_BOOT         = 1 << 10,
77        LT_BOOTROOT     = 1 << 11,
78        LT_LBA          = 1 << 12,
79        LT_OTHER        = 1 << 13,
80        LT_GENERIC      = 1 << 14,
81        LT_ECHO    = 1 << 16,
82        LT_MENUENTRY    = 1 << 17,
83        LT_ENTRY_END    = 1 << 18,
84        LT_SET_VARIABLE = 1 << 19,
85        LT_UNKNOWN      = 1 << 20,
86    };
87    
88  struct singleLine {  struct singleLine {
89      char * indent;      char * indent;
# Line 61  struct singleEntry { Line 104  struct singleEntry {
104    
105  #define GRUB_CONFIG_NO_DEFAULT    (1 << 0) /* don't write out default=0 */  #define GRUB_CONFIG_NO_DEFAULT    (1 << 0) /* don't write out default=0 */
106    
107  #define KERNEL_KERNEL    (1 << 0)  /* These defines are (only) used in addNewKernel() */
108  #define KERNEL_INITRD    (1 << 2)  #define NEED_KERNEL  (1 << 0)
109  #define KERNEL_TITLE    (1 << 3)  #define NEED_INITRD  (1 << 1)
110  #define KERNEL_ARGS    (1 << 4)  #define NEED_TITLE   (1 << 2)
111  #define KERNEL_MB           (1 << 5)  #define NEED_ARGS    (1 << 3)
112    #define NEED_MB      (1 << 4)
113    #define NEED_END     (1 << 5)
114    
115  #define MAIN_DEFAULT    (1 << 0)  #define MAIN_DEFAULT    (1 << 0)
116  #define DEFAULT_SAVED       -2  #define DEFAULT_SAVED       -2
117    #define DEFAULT_SAVED_GRUB2 -3
118    
119  struct keywordTypes {  struct keywordTypes {
120      char * key;      char * key;
121      enum lineType_e type;      enum lineType_e type;
122      char nextChar;      char nextChar;
123  } ;      char separatorChar;
124    };
125    
126    struct configFileInfo;
127    
128    typedef const char *(*findConfigFunc)(struct configFileInfo *);
129    typedef const int (*writeLineFunc)(struct configFileInfo *,
130     struct singleLine *line);
131    
132  struct configFileInfo {  struct configFileInfo {
133      char * defaultConfig;      char * defaultConfig;
134        findConfigFunc findConfig;
135        writeLineFunc writeLine;
136      struct keywordTypes * keywords;      struct keywordTypes * keywords;
137      int defaultIsIndex;      int defaultIsIndex;
138        int defaultIsVariable;
139      int defaultSupportSaved;      int defaultSupportSaved;
140      enum lineType_e entrySeparator;      enum lineType_e entryStart;
141        enum lineType_e entryEnd;
142      int needsBootPrefix;      int needsBootPrefix;
143      int argsInQuotes;      int argsInQuotes;
144      int maxTitleLength;      int maxTitleLength;
145      int titleBracketed;      int titleBracketed;
146        int titlePosition;
147        int mbHyperFirst;
148        int mbInitRdIsModule;
149        int mbConcatArgs;
150        int mbAllowExtraInitRds;
151  };  };
152    
153  struct keywordTypes grubKeywords[] = {  struct keywordTypes grubKeywords[] = {
# Line 94  struct keywordTypes grubKeywords[] = { Line 156  struct keywordTypes grubKeywords[] = {
156      { "default",    LT_DEFAULT,    ' ' },      { "default",    LT_DEFAULT,    ' ' },
157      { "fallback",   LT_FALLBACK,    ' ' },      { "fallback",   LT_FALLBACK,    ' ' },
158      { "kernel",    LT_KERNEL,    ' ' },      { "kernel",    LT_KERNEL,    ' ' },
159      { "initrd",    LT_INITRD,    ' ' },      { "initrd",    LT_INITRD,    ' ', ' ' },
160      { "module",     LT_MBMODULE,    ' ' },      { "module",     LT_MBMODULE,    ' ' },
161        { "kernel",     LT_HYPER,       ' ' },
162      { NULL,    0, 0 },      { NULL,    0, 0 },
163  };  };
164    
165    const char *grubFindConfig(struct configFileInfo *cfi) {
166        static const char *configFiles[] = {
167     "/etc/grub.conf",
168     "/boot/grub/grub.conf",
169     "/boot/grub/menu.lst",
170     NULL
171        };
172        static int i = -1;
173    
174        if (i == -1) {
175     for (i = 0; configFiles[i] != NULL; i++) {
176        dbgPrintf("Checking \"%s\": ", configFiles[i]);
177        if (!access(configFiles[i], R_OK)) {
178     dbgPrintf("found\n");
179     return configFiles[i];
180        }
181        dbgPrintf("not found\n");
182     }
183        }
184        return configFiles[i];
185    }
186    
187  struct configFileInfo grubConfigType = {  struct configFileInfo grubConfigType = {
188      "/boot/grub/grub.conf",    /* defaultConfig */      .findConfig = grubFindConfig,
189      grubKeywords,    /* keywords */      .keywords = grubKeywords,
190      1,    /* defaultIsIndex */      .defaultIsIndex = 1,
191      1,    /* defaultSupportSaved */      .defaultSupportSaved = 1,
192      LT_TITLE,    /* entrySeparator */      .entryStart = LT_TITLE,
193      1,    /* needsBootPrefix */      .needsBootPrefix = 1,
194      0,    /* argsInQuotes */      .mbHyperFirst = 1,
195      0,    /* maxTitleLength */      .mbInitRdIsModule = 1,
196      0,                                      /* titleBracketed */      .mbAllowExtraInitRds = 1,
197    };
198    
199    struct keywordTypes grub2Keywords[] = {
200        { "menuentry",  LT_MENUENTRY,   ' ' },
201        { "}",          LT_ENTRY_END,   ' ' },
202        { "echo",       LT_ECHO,        ' ' },
203        { "set",        LT_SET_VARIABLE,' ', '=' },
204        { "root",       LT_BOOTROOT,    ' ' },
205        { "default",    LT_DEFAULT,     ' ' },
206        { "fallback",   LT_FALLBACK,    ' ' },
207        { "linux",      LT_KERNEL,      ' ' },
208        { "initrd",     LT_INITRD,      ' ', ' ' },
209        { "module",     LT_MBMODULE,    ' ' },
210        { "kernel",     LT_HYPER,       ' ' },
211        { NULL, 0, 0 },
212    };
213    
214    const char *grub2FindConfig(struct configFileInfo *cfi) {
215        static const char *configFiles[] = {
216     "/boot/grub/grub-efi.cfg",
217     "/boot/grub/grub.cfg",
218     NULL
219        };
220        static int i = -1;
221        static const char *grub_cfg = "/boot/grub/grub.cfg";
222    
223        if (i == -1) {
224     for (i = 0; configFiles[i] != NULL; i++) {
225        dbgPrintf("Checking \"%s\": ", configFiles[i]);
226        if (!access(configFiles[i], R_OK)) {
227     dbgPrintf("found\n");
228     return configFiles[i];
229        }
230     }
231        }
232    
233        /* Ubuntu renames grub2 to grub, so check for the grub.d directory
234         * that isn't in grub1, and if it exists, return the config file path
235         * that they use. */
236        if (configFiles[i] == NULL && !access("/etc/grub.d/", R_OK)) {
237     dbgPrintf("found\n");
238     return grub_cfg;
239        }
240    
241        dbgPrintf("not found\n");
242        return configFiles[i];
243    }
244    
245    int sizeOfSingleLine(struct singleLine * line) {
246      int count = 0;
247    
248      for (int i = 0; i < line->numElements; i++) {
249        int indentSize = 0;
250    
251        count = count + strlen(line->elements[i].item);
252    
253        indentSize = strlen(line->elements[i].indent);
254        if (indentSize > 0)
255          count = count + indentSize;
256        else
257          /* be extra safe and add room for whitespaces */
258          count = count + 1;
259      }
260    
261      /* room for trailing terminator */
262      count = count + 1;
263    
264      return count;
265    }
266    
267    static int isquote(char q)
268    {
269        if (q == '\'' || q == '\"')
270     return 1;
271        return 0;
272    }
273    
274    char *grub2ExtractTitle(struct singleLine * line) {
275        char * current;
276        char * current_indent;
277        int current_len;
278        int current_indent_len;
279        int i;
280    
281        /* bail out if line does not start with menuentry */
282        if (strcmp(line->elements[0].item, "menuentry"))
283          return NULL;
284    
285        i = 1;
286        current = line->elements[i].item;
287        current_len = strlen(current);
288    
289        /* if second word is quoted, strip the quotes and return single word */
290        if (isquote(*current) && isquote(current[current_len - 1])) {
291     char *tmp;
292    
293     tmp = strdup(current);
294     *(tmp + current_len - 1) = '\0';
295     return ++tmp;
296        }
297    
298        /* if no quotes, return second word verbatim */
299        if (!isquote(*current))
300     return current;
301    
302        /* second element start with a quote, so we have to find the element
303         * whose last character is also quote (assuming it's the closing one) */
304        int resultMaxSize;
305        char * result;
306        
307        resultMaxSize = sizeOfSingleLine(line);
308        result = malloc(resultMaxSize);
309        snprintf(result, resultMaxSize, "%s", ++current);
310        
311        i++;
312        for (; i < line->numElements; ++i) {
313     current = line->elements[i].item;
314     current_len = strlen(current);
315     current_indent = line->elements[i].indent;
316     current_indent_len = strlen(current_indent);
317    
318     strncat(result, current_indent, current_indent_len);
319     if (!isquote(current[current_len-1])) {
320        strncat(result, current, current_len);
321     } else {
322        strncat(result, current, current_len - 1);
323        break;
324     }
325        }
326        return result;
327    }
328    
329    struct configFileInfo grub2ConfigType = {
330        .findConfig = grub2FindConfig,
331        .keywords = grub2Keywords,
332        .defaultIsIndex = 1,
333        .defaultSupportSaved = 1,
334        .defaultIsVariable = 1,
335        .entryStart = LT_MENUENTRY,
336        .entryEnd = LT_ENTRY_END,
337        .titlePosition = 1,
338        .needsBootPrefix = 1,
339        .mbHyperFirst = 1,
340        .mbInitRdIsModule = 1,
341        .mbAllowExtraInitRds = 1,
342  };  };
343    
344  struct keywordTypes yabootKeywords[] = {  struct keywordTypes yabootKeywords[] = {
# Line 142  struct keywordTypes yabootKeywords[] = { Line 372  struct keywordTypes yabootKeywords[] = {
372      { "partition",  LT_GENERIC,    '=' },      { "partition",  LT_GENERIC,    '=' },
373      { "device",    LT_GENERIC,    '=' },      { "device",    LT_GENERIC,    '=' },
374      { "fstype",    LT_GENERIC,    '=' },      { "fstype",    LT_GENERIC,    '=' },
375      { "initrd",    LT_INITRD,    '=' },      { "initrd",    LT_INITRD,    '=', ';' },
376      { "append",    LT_KERNELARGS,  '=' },      { "append",    LT_KERNELARGS,  '=' },
377      { "boot",    LT_BOOT,    '=' },      { "boot",    LT_BOOT,    '=' },
378      { "lba",    LT_LBA,    ' ' },      { "lba",    LT_LBA,    ' ' },
# Line 162  struct keywordTypes liloKeywords[] = { Line 392  struct keywordTypes liloKeywords[] = {
392      { NULL,    0, 0 },      { NULL,    0, 0 },
393  };  };
394    
395    struct keywordTypes eliloKeywords[] = {
396        { "label",    LT_TITLE,    '=' },
397        { "root",    LT_ROOT,    '=' },
398        { "default",    LT_DEFAULT,    '=' },
399        { "image",    LT_KERNEL,    '=' },
400        { "initrd",    LT_INITRD,    '=' },
401        { "append",    LT_KERNELARGS,  '=' },
402        { "vmm",    LT_HYPER,       '=' },
403        { NULL,    0, 0 },
404    };
405    
406  struct keywordTypes siloKeywords[] = {  struct keywordTypes siloKeywords[] = {
407      { "label",    LT_TITLE,    '=' },      { "label",    LT_TITLE,    '=' },
408      { "root",    LT_ROOT,    '=' },      { "root",    LT_ROOT,    '=' },
# Line 183  struct keywordTypes ziplKeywords[] = { Line 424  struct keywordTypes ziplKeywords[] = {
424      { NULL,         0, 0 },      { NULL,         0, 0 },
425  };  };
426    
427    struct keywordTypes extlinuxKeywords[] = {
428        { "label",    LT_TITLE,    ' ' },
429        { "root",    LT_ROOT,    ' ' },
430        { "default",    LT_DEFAULT,    ' ' },
431        { "kernel",    LT_KERNEL,    ' ' },
432        { "initrd",    LT_INITRD,      ' ', ',' },
433        { "append",    LT_KERNELARGS,  ' ' },
434        { "prompt",     LT_UNKNOWN,     ' ' },
435        { NULL,    0, 0 },
436    };
437    int useextlinuxmenu;
438  struct configFileInfo eliloConfigType = {  struct configFileInfo eliloConfigType = {
439      "/boot/efi/EFI/redhat/elilo.conf",    /* defaultConfig */      .defaultConfig = "/boot/efi/EFI/redhat/elilo.conf",
440      liloKeywords,    /* keywords */      .keywords = eliloKeywords,
441      0,    /* defaultIsIndex */      .entryStart = LT_KERNEL,
442      0,    /* defaultSupportSaved */      .needsBootPrefix = 1,
443      LT_KERNEL,    /* entrySeparator */      .argsInQuotes = 1,
444      1,                    /* needsBootPrefix */      .mbConcatArgs = 1,
     1,    /* argsInQuotes */  
     0,    /* maxTitleLength */  
     0,                                      /* titleBracketed */  
445  };  };
446    
447  struct configFileInfo liloConfigType = {  struct configFileInfo liloConfigType = {
448      "/etc/lilo.conf",    /* defaultConfig */      .defaultConfig = "/etc/lilo.conf",
449      liloKeywords,    /* keywords */      .keywords = liloKeywords,
450      0,    /* defaultIsIndex */      .entryStart = LT_KERNEL,
451      0,    /* defaultSupportSaved */      .argsInQuotes = 1,
452      LT_KERNEL,    /* entrySeparator */      .maxTitleLength = 15,
     0,    /* needsBootPrefix */  
     1,    /* argsInQuotes */  
     15,    /* maxTitleLength */  
     0,                                      /* titleBracketed */  
453  };  };
454    
455  struct configFileInfo yabootConfigType = {  struct configFileInfo yabootConfigType = {
456      "/etc/yaboot.conf",    /* defaultConfig */      .defaultConfig = "/etc/yaboot.conf",
457      yabootKeywords,    /* keywords */      .keywords = yabootKeywords,
458      0,    /* defaultIsIndex */      .entryStart = LT_KERNEL,
459      0,    /* defaultSupportSaved */      .needsBootPrefix = 1,
460      LT_KERNEL,    /* entrySeparator */      .argsInQuotes = 1,
461      1,    /* needsBootPrefix */      .maxTitleLength = 15,
462      1,    /* argsInQuotes */      .mbAllowExtraInitRds = 1,
     15,    /* maxTitleLength */  
     0,                                      /* titleBracketed */  
463  };  };
464    
465  struct configFileInfo siloConfigType = {  struct configFileInfo siloConfigType = {
466      "/etc/silo.conf",    /* defaultConfig */      .defaultConfig = "/etc/silo.conf",
467      siloKeywords,    /* keywords */      .keywords = siloKeywords,
468      0,    /* defaultIsIndex */      .entryStart = LT_KERNEL,
469      0,    /* defaultSupportSaved */      .needsBootPrefix = 1,
470      LT_KERNEL,    /* entrySeparator */      .argsInQuotes = 1,
471      1,    /* needsBootPrefix */      .maxTitleLength = 15,
     1,    /* argsInQuotes */  
     15,    /* maxTitleLength */  
     0,                                      /* titleBracketed */  
472  };  };
473    
474  struct configFileInfo ziplConfigType = {  struct configFileInfo ziplConfigType = {
475      "/etc/zipl.conf",    /* defaultConfig */      .defaultConfig = "/etc/zipl.conf",
476      ziplKeywords,    /* keywords */      .keywords = ziplKeywords,
477      0,    /* defaultIsIndex */      .entryStart = LT_TITLE,
478      0,    /* defaultSupportSaved */      .argsInQuotes = 1,
479      LT_TITLE,    /* entrySeparator */      .titleBracketed = 1,
480      0,    /* needsBootPrefix */  };
481      1,    /* argsInQuotes */  
482      15,    /* maxTitleLength */  struct configFileInfo extlinuxConfigType = {
483      1,                                      /* titleBracketed */      .defaultConfig = "/boot/extlinux/extlinux.conf",
484        .keywords = extlinuxKeywords,
485        .entryStart = LT_TITLE,
486        .needsBootPrefix = 1,
487        .maxTitleLength = 255,
488        .mbAllowExtraInitRds = 1,
489  };  };
490    
491  struct grubConfig {  struct grubConfig {
# Line 255  struct grubConfig { Line 500  struct grubConfig {
500      struct configFileInfo * cfi;      struct configFileInfo * cfi;
501  };  };
502    
503    blkid_cache blkid;
504    
505  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index);  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index);
506  struct singleEntry * findEntryByPath(struct grubConfig * cfg,  struct singleEntry * findEntryByPath(struct grubConfig * cfg,
507       const char * path, const char * prefix,       const char * path, const char * prefix,
508       int * index);       int * index);
 static char * strndup(char * from, int len);  
509  static int readFile(int fd, char ** bufPtr);  static int readFile(int fd, char ** bufPtr);
510  static void lineInit(struct singleLine * line);  static void lineInit(struct singleLine * line);
511    struct singleLine * lineDup(struct singleLine * line);
512  static void lineFree(struct singleLine * line);  static void lineFree(struct singleLine * line);
513  static int lineWrite(FILE * out, struct singleLine * line,  static int lineWrite(FILE * out, struct singleLine * line,
514       struct configFileInfo * cfi);       struct configFileInfo * cfi);
515  static int getNextLine(char ** bufPtr, struct singleLine * line,  static int getNextLine(char ** bufPtr, struct singleLine * line,
516         struct configFileInfo * cfi);         struct configFileInfo * cfi);
517  static char * getRootSpecifier(char * str);  static char * getRootSpecifier(char * str);
518    static void requote(struct singleLine *line, struct configFileInfo * cfi);
519  static char * strndup(char * from, int len) {  static void insertElement(struct singleLine * line,
520      char * to;    const char * item, int insertHere,
521      struct configFileInfo * cfi);
522      to = malloc(len + 1);  static void removeElement(struct singleLine * line, int removeHere);
523      strncpy(to, from, len);  static struct keywordTypes * getKeywordByType(enum lineType_e type,
524      to[len] = '\0';        struct configFileInfo * cfi);
525    static enum lineType_e getTypeByKeyword(char * keyword,
526      return to;   struct configFileInfo * cfi);
527  }  static struct singleLine * getLineByType(enum lineType_e type,
528     struct singleLine * line);
529    static int checkForExtLinux(struct grubConfig * config);
530    struct singleLine * addLineTmpl(struct singleEntry * entry,
531                                    struct singleLine * tmplLine,
532                                    struct singleLine * prevLine,
533                                    const char * val,
534     struct configFileInfo * cfi);
535    struct singleLine *  addLine(struct singleEntry * entry,
536                                 struct configFileInfo * cfi,
537                                 enum lineType_e type, char * defaultIndent,
538                                 const char * val);
539    
540  static char * sdupprintf(const char *format, ...)  static char * sdupprintf(const char *format, ...)
541  #ifdef __GNUC__  #ifdef __GNUC__
# Line 313  static char * sdupprintf(const char *for Line 570  static char * sdupprintf(const char *for
570      return buf;      return buf;
571  }  }
572    
573    static struct keywordTypes * getKeywordByType(enum lineType_e type,
574          struct configFileInfo * cfi) {
575        for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
576     if (kw->type == type)
577        return kw;
578        }
579        return NULL;
580    }
581    
582    static char *getKeyByType(enum lineType_e type, struct configFileInfo * cfi) {
583        struct keywordTypes *kt = getKeywordByType(type, cfi);
584        if (kt)
585     return kt->key;
586        return "unknown";
587    }
588    
589    static char * getpathbyspec(char *device) {
590        if (!blkid)
591            blkid_get_cache(&blkid, NULL);
592    
593        return blkid_get_devname(blkid, device, NULL);
594    }
595    
596    static char * getuuidbydev(char *device) {
597        if (!blkid)
598     blkid_get_cache(&blkid, NULL);
599    
600        return blkid_get_tag_value(blkid, "UUID", device);
601    }
602    
603    static enum lineType_e getTypeByKeyword(char * keyword,
604     struct configFileInfo * cfi) {
605        for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
606     if (!strcmp(keyword, kw->key))
607        return kw->type;
608        }
609        return LT_UNKNOWN;
610    }
611    
612    static struct singleLine * getLineByType(enum lineType_e type,
613     struct singleLine * line) {
614        dbgPrintf("getLineByType(%d): ", type);
615        for (; line; line = line->next) {
616     dbgPrintf("%d:%s ", line->type,
617      line->numElements ? line->elements[0].item : "(empty)");
618     if (line->type & type) break;
619        }
620        dbgPrintf(line ? "\n" : " (failed)\n");
621        return line;
622    }
623    
624  static int isBracketedTitle(struct singleLine * line) {  static int isBracketedTitle(struct singleLine * line) {
625      if ((*line->elements[0].item == '[') && (line->numElements == 1)) {      if (line->numElements == 1 && *line->elements[0].item == '[') {
626          int len = strlen(line->elements[0].item);          int len = strlen(line->elements[0].item);
627          if (*(line->elements[0].item + len - 1) == ']') {          if (*(line->elements[0].item + len - 1) == ']') {
628              /* FIXME: this is a hack... */              /* FIXME: this is a hack... */
# Line 326  static int isBracketedTitle(struct singl Line 634  static int isBracketedTitle(struct singl
634      return 0;      return 0;
635  }  }
636    
637  /* figure out if this is a entry separator */  static int isEntryStart(struct singleLine * line,
 static int isEntrySeparator(struct singleLine * line,  
638                              struct configFileInfo * cfi) {                              struct configFileInfo * cfi) {
639      if (line->type == LT_WHITESPACE)      return line->type == cfi->entryStart || line->type == LT_OTHER ||
640   return 0;   (cfi->titleBracketed && isBracketedTitle(line));
     if (line->type == cfi->entrySeparator)  
         return 1;  
     if (line->type == LT_OTHER)  
         return 1;  
     if (cfi->titleBracketed && isBracketedTitle(line)) {  
         return 1;  
     }  
     return 0;  
641  }  }
642    
643  /* extract the title from within brackets (for zipl) */  /* extract the title from within brackets (for zipl) */
# Line 389  static void lineInit(struct singleLine * Line 688  static void lineInit(struct singleLine *
688      line->next = NULL;      line->next = NULL;
689  }  }
690    
691  static void lineFree(struct singleLine * line) {  struct singleLine * lineDup(struct singleLine * line) {
692      int i;      struct singleLine * newLine = malloc(sizeof(*newLine));
693    
694        newLine->indent = strdup(line->indent);
695        newLine->next = NULL;
696        newLine->type = line->type;
697        newLine->numElements = line->numElements;
698        newLine->elements = malloc(sizeof(*newLine->elements) *
699           newLine->numElements);
700    
701        for (int i = 0; i < newLine->numElements; i++) {
702     newLine->elements[i].indent = strdup(line->elements[i].indent);
703     newLine->elements[i].item = strdup(line->elements[i].item);
704        }
705    
706        return newLine;
707    }
708    
709    static void lineFree(struct singleLine * line) {
710      if (line->indent) free(line->indent);      if (line->indent) free(line->indent);
711    
712      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
713   free(line->elements[i].item);   free(line->elements[i].item);
714   free(line->elements[i].indent);   free(line->elements[i].indent);
715      }      }
# Line 405  static void lineFree(struct singleLine * Line 720  static void lineFree(struct singleLine *
720    
721  static int lineWrite(FILE * out, struct singleLine * line,  static int lineWrite(FILE * out, struct singleLine * line,
722       struct configFileInfo * cfi) {       struct configFileInfo * cfi) {
     int i;  
   
723      if (fprintf(out, "%s", line->indent) == -1) return -1;      if (fprintf(out, "%s", line->indent) == -1) return -1;
724    
725      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
726     /* Need to handle this, because we strip the quotes from
727     * menuentry when read it. */
728     if (line->type == LT_MENUENTRY && i == 1) {
729        if(!isquote(*line->elements[i].item))
730     fprintf(out, "\'%s\'", line->elements[i].item);
731        else
732     fprintf(out, "%s", line->elements[i].item);
733        fprintf(out, "%s", line->elements[i].indent);
734    
735        continue;
736     }
737    
738   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)
739      if (fputc('"', out) == EOF) return -1;      if (fputc('"', out) == EOF) return -1;
740    
741   if (fprintf(out, "%s", line->elements[i].item) == -1) return -1;   if (fprintf(out, "%s", line->elements[i].item) == -1) return -1;
742   if (fprintf(out, "%s", line->elements[i].indent) == -1) return -1;   if (i < line->numElements - 1)
743        if (fprintf(out, "%s", line->elements[i].indent) == -1) return -1;
744      }      }
745    
746      if (line->type == LT_KERNELARGS && cfi->argsInQuotes)      if (line->type == LT_KERNELARGS && cfi->argsInQuotes)
# Line 433  static int getNextLine(char ** bufPtr, s Line 759  static int getNextLine(char ** bufPtr, s
759      char * chptr;      char * chptr;
760      int elementsAlloced = 0;      int elementsAlloced = 0;
761      struct lineElement * element;      struct lineElement * element;
     struct keywordTypes * keywords = cfi->keywords;  
762      int first = 1;      int first = 1;
     int i;  
763    
764      lineFree(line);      lineFree(line);
765    
# Line 489  static int getNextLine(char ** bufPtr, s Line 813  static int getNextLine(char ** bufPtr, s
813      if (!line->numElements)      if (!line->numElements)
814   line->type = LT_WHITESPACE;   line->type = LT_WHITESPACE;
815      else {      else {
816   for (i = 0; keywords[i].key; i++)   line->type = getTypeByKeyword(line->elements[0].item, cfi);
817      if (!strcmp(line->elements[0].item, keywords[i].key)) break;   if (line->type == LT_UNKNOWN) {
   
  if (keywords[i].key) {  
     line->type = keywords[i].type;  
  } else {  
     line->type = LT_UNKNOWN;  
               
818              /* zipl does [title] instead of something reasonable like all              /* zipl does [title] instead of something reasonable like all
819               * the other boot loaders.  kind of ugly */               * the other boot loaders.  kind of ugly */
820              if (cfi->titleBracketed && isBracketedTitle(line)) {              if (cfi->titleBracketed && isBracketedTitle(line)) {
# Line 510  static int getNextLine(char ** bufPtr, s Line 828  static int getNextLine(char ** bufPtr, s
828      if (*line->elements[0].item == '#') {      if (*line->elements[0].item == '#') {
829   char * fullLine;   char * fullLine;
830   int len;   int len;
  int i;  
831    
832   len = strlen(line->indent);   len = strlen(line->indent);
833   for (i = 0; i < line->numElements; i++)   for (int i = 0; i < line->numElements; i++)
834      len += strlen(line->elements[i].item) +      len += strlen(line->elements[i].item) +
835     strlen(line->elements[i].indent);     strlen(line->elements[i].indent);
836    
# Line 522  static int getNextLine(char ** bufPtr, s Line 839  static int getNextLine(char ** bufPtr, s
839   free(line->indent);   free(line->indent);
840   line->indent = fullLine;   line->indent = fullLine;
841    
842   for (i = 0; i < line->numElements; i++) {   for (int i = 0; i < line->numElements; i++) {
843      strcat(fullLine, line->elements[i].item);      strcat(fullLine, line->elements[i].item);
844      strcat(fullLine, line->elements[i].indent);      strcat(fullLine, line->elements[i].indent);
845      free(line->elements[i].item);      free(line->elements[i].item);
# Line 532  static int getNextLine(char ** bufPtr, s Line 849  static int getNextLine(char ** bufPtr, s
849   line->type = LT_WHITESPACE;   line->type = LT_WHITESPACE;
850   line->numElements = 0;   line->numElements = 0;
851      }      }
852     } else {
853     struct keywordTypes *kw;
854    
855     kw = getKeywordByType(line->type, cfi);
856    
857     /* space isn't the only separator, we need to split
858     * elements up more
859     */
860     if (!isspace(kw->separatorChar)) {
861        char indent[2] = "";
862        indent[0] = kw->separatorChar;
863        for (int i = 1; i < line->numElements; i++) {
864     char *p;
865     int numNewElements;
866    
867     numNewElements = 0;
868     p = line->elements[i].item;
869     while (*p != '\0') {
870     if (*p == kw->separatorChar)
871     numNewElements++;
872     p++;
873     }
874     if (line->numElements + numNewElements >= elementsAlloced) {
875     elementsAlloced += numNewElements + 5;
876     line->elements = realloc(line->elements,
877        sizeof(*line->elements) * elementsAlloced);
878     }
879    
880     for (int j = line->numElements; j > i; j--) {
881     line->elements[j + numNewElements] = line->elements[j];
882     }
883     line->numElements += numNewElements;
884    
885     p = line->elements[i].item;
886     while (*p != '\0') {
887    
888     while (*p != kw->separatorChar && *p != '\0') p++;
889     if (*p == '\0') {
890     break;
891     }
892    
893     line->elements[i + 1].indent = line->elements[i].indent;
894     line->elements[i].indent = strdup(indent);
895     *p++ = '\0';
896     i++;
897     line->elements[i].item = strdup(p);
898     }
899        }
900     }
901   }   }
902      }      }
903    
# Line 549  static struct grubConfig * readConfig(co Line 915  static struct grubConfig * readConfig(co
915      struct singleLine * last = NULL, * line, * defaultLine = NULL;      struct singleLine * last = NULL, * line, * defaultLine = NULL;
916      char * end;      char * end;
917      struct singleEntry * entry = NULL;      struct singleEntry * entry = NULL;
918      int i, len;      int len;
919      char * buf;      char * buf;
920    
921      if (!strcmp(inName, "-")) {      if (!strcmp(inName, "-")) {
# Line 595  static struct grubConfig * readConfig(co Line 961  static struct grubConfig * readConfig(co
961      cfg->secondaryIndent = strdup(line->indent);      cfg->secondaryIndent = strdup(line->indent);
962   }   }
963    
964   if (isEntrySeparator(line, cfi)) {   if (isEntryStart(line, cfi) || (cfg->entries && !sawEntry)) {
965      sawEntry = 1;      sawEntry = 1;
966      if (!entry) {      if (!entry) {
967   cfg->entries = malloc(sizeof(*entry));   cfg->entries = malloc(sizeof(*entry));
# Line 611  static struct grubConfig * readConfig(co Line 977  static struct grubConfig * readConfig(co
977      entry->next = NULL;      entry->next = NULL;
978   }   }
979    
980   if (line->type == LT_DEFAULT && line->numElements == 2) {   if (line->type == LT_SET_VARIABLE) {
981        dbgPrintf("found 'set' command (%d elements): ", line->numElements);
982        dbgPrintf("%s", line->indent);
983        for (int i = 0; i < line->numElements; i++)
984     dbgPrintf("\"%s\"%s", line->elements[i].item, line->elements[i].indent);
985        dbgPrintf("\n");
986        struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
987        if (kwType && line->numElements == 3 &&
988        !strcmp(line->elements[1].item, kwType->key)) {
989     dbgPrintf("Line sets default config\n");
990     cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
991     defaultLine = line;
992        }
993     } else if (line->type == LT_DEFAULT && line->numElements == 2) {
994      cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;      cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
995      defaultLine = line;      defaultLine = line;
996    
997            } else if (line->type == LT_KERNEL) {
998        /* if by some freak chance this is multiboot and the "module"
999         * lines came earlier in the template, make sure to use LT_HYPER
1000         * instead of LT_KERNEL now
1001         */
1002        if (entry->multiboot)
1003     line->type = LT_HYPER;
1004    
1005          } else if (line->type == LT_MBMODULE) {          } else if (line->type == LT_MBMODULE) {
1006        /* go back and fix the LT_KERNEL line to indicate LT_HYPER
1007         * instead, now that we know this is a multiboot entry.
1008         * This only applies to grub, but that's the only place we
1009         * should find LT_MBMODULE lines anyway.
1010         */
1011        for (struct singleLine *l = entry->lines; l; l = l->next) {
1012     if (l->type == LT_HYPER)
1013        break;
1014     else if (l->type == LT_KERNEL) {
1015        l->type = LT_HYPER;
1016        break;
1017     }
1018        }
1019              entry->multiboot = 1;              entry->multiboot = 1;
1020    
1021     } else if (line->type == LT_HYPER) {
1022        entry->multiboot = 1;
1023    
1024   } else if (line->type == LT_FALLBACK && line->numElements == 2) {   } else if (line->type == LT_FALLBACK && line->numElements == 2) {
1025      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);
1026      if (*end) cfg->fallbackImage = -1;      if (*end) cfg->fallbackImage = -1;
1027    
1028   } else if (line->type == LT_TITLE && line->numElements > 1) {   } else if (line->type == LT_TITLE && line->numElements > 1) {
1029      /* make the title a single argument (undoing our parsing) */      /* make the title a single argument (undoing our parsing) */
1030      len = 0;      len = 0;
1031      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
1032   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
1033   len += strlen(line->elements[i].indent);   len += strlen(line->elements[i].indent);
1034      }      }
1035      buf = malloc(len + 1);      buf = malloc(len + 1);
1036      *buf = '\0';      *buf = '\0';
1037    
1038      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
1039   strcat(buf, line->elements[i].item);   strcat(buf, line->elements[i].item);
1040   free(line->elements[i].item);   free(line->elements[i].item);
1041    
# Line 643  static struct grubConfig * readConfig(co Line 1049  static struct grubConfig * readConfig(co
1049      line->elements[line->numElements - 1].indent;      line->elements[line->numElements - 1].indent;
1050      line->elements[1].item = buf;      line->elements[1].item = buf;
1051      line->numElements = 2;      line->numElements = 2;
1052     } else if (line->type == LT_MENUENTRY && line->numElements > 3) {
1053        /* let --remove-kernel="TITLE=what" work */
1054        len = 0;
1055        char *extras;
1056        char *title;
1057    
1058        for (int i = 1; i < line->numElements; i++) {
1059     len += strlen(line->elements[i].item);
1060     len += strlen(line->elements[i].indent);
1061        }
1062        buf = malloc(len + 1);
1063        *buf = '\0';
1064    
1065        /* allocate mem for extra flags. */
1066        extras = malloc(len + 1);
1067        *extras = '\0';
1068    
1069        /* get title. */
1070        for (int i = 0; i < line->numElements; i++) {
1071     if (!strcmp(line->elements[i].item, "menuentry"))
1072        continue;
1073     if (isquote(*line->elements[i].item))
1074        title = line->elements[i].item + 1;
1075     else
1076        title = line->elements[i].item;
1077    
1078     len = strlen(title);
1079            if (isquote(title[len-1])) {
1080        strncat(buf, title,len-1);
1081        break;
1082     } else {
1083        strcat(buf, title);
1084        strcat(buf, line->elements[i].indent);
1085     }
1086        }
1087    
1088        /* get extras */
1089        int count = 0;
1090        for (int i = 0; i < line->numElements; i++) {
1091     if (count >= 2) {
1092        strcat(extras, line->elements[i].item);
1093        strcat(extras, line->elements[i].indent);
1094     }
1095    
1096     if (!strcmp(line->elements[i].item, "menuentry"))
1097        continue;
1098    
1099     /* count ' or ", there should be two in menuentry line. */
1100     if (isquote(*line->elements[i].item))
1101        count++;
1102    
1103     len = strlen(line->elements[i].item);
1104    
1105     if (isquote(line->elements[i].item[len -1]))
1106        count++;
1107    
1108     /* ok, we get the final ' or ", others are extras. */
1109                }
1110        line->elements[1].indent =
1111     line->elements[line->numElements - 2].indent;
1112        line->elements[1].item = buf;
1113        line->elements[2].indent =
1114     line->elements[line->numElements - 2].indent;
1115        line->elements[2].item = extras;
1116        line->numElements = 3;
1117   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {
1118      /* Strip off any " which may be present; they'll be put back      /* Strip off any " which may be present; they'll be put back
1119         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 651  static struct grubConfig * readConfig(co Line 1122  static struct grubConfig * readConfig(co
1122      if (line->numElements >= 2) {      if (line->numElements >= 2) {
1123   int last, len;   int last, len;
1124    
1125   if (*line->elements[1].item == '"')   if (isquote(*line->elements[1].item))
1126      memcpy(line->elements[1].item, line->elements[1].item + 1,      memmove(line->elements[1].item, line->elements[1].item + 1,
1127     strlen(line->elements[1].item + 1) + 1);      strlen(line->elements[1].item + 1) + 1);
1128    
1129   last = line->numElements - 1;   last = line->numElements - 1;
1130   len = strlen(line->elements[last].item) - 1;   len = strlen(line->elements[last].item) - 1;
1131   if (line->elements[last].item[len] == '"')   if (isquote(line->elements[last].item[len]))
1132      line->elements[last].item[len] = '\0';      line->elements[last].item[len] = '\0';
1133      }      }
   
1134   }   }
1135    
1136   /* If we find a generic config option which should live at the   /* If we find a generic config option which should live at the
# Line 680  static struct grubConfig * readConfig(co Line 1150  static struct grubConfig * readConfig(co
1150   movedLine = 1;   movedLine = 1;
1151   continue; /* without setting 'last' */   continue; /* without setting 'last' */
1152   }   }
1153    
1154   /* If a second line of whitespace happens after a generic option   /* If a second line of whitespace happens after a generic option
1155     which was moved, drop it. */     which was moved, drop it. */
1156   if (movedLine && line->type == LT_WHITESPACE && last->type == LT_WHITESPACE) {   if (movedLine && line->type == LT_WHITESPACE && last->type == LT_WHITESPACE) {
# Line 695  static struct grubConfig * readConfig(co Line 1166  static struct grubConfig * readConfig(co
1166   entry->lines = line;   entry->lines = line;
1167      else      else
1168   last->next = line;   last->next = line;
1169        dbgPrintf("readConfig added %s to %p\n", getKeyByType(line->type, cfi), entry);
1170    
1171        /* we could have seen this outside of an entry... if so, we
1172         * ignore it like any other line we don't grok */
1173        if (line->type == LT_ENTRY_END && sawEntry)
1174     sawEntry = 0;
1175   } else {   } else {
1176      if (!cfg->theLines)      if (!cfg->theLines)
1177   cfg->theLines = line;   cfg->theLines = line;
1178      else {      else
1179   last->next = line;   last->next = line;
1180      }      dbgPrintf("readConfig added %s to cfg\n", getKeyByType(line->type, cfi));
1181   }   }
1182    
1183   last = line;   last = line;
# Line 708  static struct grubConfig * readConfig(co Line 1185  static struct grubConfig * readConfig(co
1185    
1186      free(incoming);      free(incoming);
1187    
1188        dbgPrintf("defaultLine is %s\n", defaultLine ? "set" : "unset");
1189      if (defaultLine) {      if (defaultLine) {
1190   if (cfi->defaultSupportSaved &&          if (defaultLine->numElements > 2 &&
1191        cfi->defaultSupportSaved &&
1192        !strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {
1193        cfg->defaultImage = DEFAULT_SAVED_GRUB2;
1194     } else if (cfi->defaultIsVariable) {
1195        char *value = defaultLine->elements[2].item;
1196        while (*value && (*value == '"' || *value == '\'' ||
1197        *value == ' ' || *value == '\t'))
1198     value++;
1199        cfg->defaultImage = strtol(value, &end, 10);
1200        while (*end && (*end == '"' || *end == '\'' ||
1201        *end == ' ' || *end == '\t'))
1202     end++;
1203        if (*end) cfg->defaultImage = -1;
1204     } else if (cfi->defaultSupportSaved &&
1205   !strncmp(defaultLine->elements[1].item, "saved", 5)) {   !strncmp(defaultLine->elements[1].item, "saved", 5)) {
1206      cfg->defaultImage = DEFAULT_SAVED;      cfg->defaultImage = DEFAULT_SAVED;
1207   } else if (cfi->defaultIsIndex) {   } else if (cfi->defaultIsIndex) {
1208      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);
1209      if (*end) cfg->defaultImage = -1;      if (*end) cfg->defaultImage = -1;
1210   } else if (defaultLine->numElements >= 2) {   } else if (defaultLine->numElements >= 2) {
1211      i = 0;      int i = 0;
1212      while ((entry = findEntryByIndex(cfg, i))) {      while ((entry = findEntryByIndex(cfg, i))) {
1213   for (line = entry->lines; line; line = line->next)   for (line = entry->lines; line; line = line->next)
1214      if (line->type == LT_TITLE) break;      if (line->type == LT_TITLE) break;
# Line 730  static struct grubConfig * readConfig(co Line 1222  static struct grubConfig * readConfig(co
1222                                  extractTitle(line))) break;                                  extractTitle(line))) break;
1223                  }                  }
1224   i++;   i++;
1225     entry = NULL;
1226      }      }
1227    
1228      if (entry) cfg->defaultImage = i;      if (entry){
1229            cfg->defaultImage = i;
1230        }else{
1231            cfg->defaultImage = -1;
1232        }
1233   }   }
1234        } else {
1235            cfg->defaultImage = 0;
1236      }      }
1237    
1238      return cfg;      return cfg;
# Line 749  static void writeDefault(FILE * out, cha Line 1248  static void writeDefault(FILE * out, cha
1248    
1249      if (cfg->defaultImage == DEFAULT_SAVED)      if (cfg->defaultImage == DEFAULT_SAVED)
1250   fprintf(out, "%sdefault%ssaved\n", indent, separator);   fprintf(out, "%sdefault%ssaved\n", indent, separator);
1251        else if (cfg->defaultImage == DEFAULT_SAVED_GRUB2)
1252     fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
1253      else if (cfg->defaultImage > -1) {      else if (cfg->defaultImage > -1) {
1254   if (cfg->cfi->defaultIsIndex) {   if (cfg->cfi->defaultIsIndex) {
1255      fprintf(out, "%sdefault%s%d\n", indent, separator,      if (cfg->cfi->defaultIsVariable) {
1256      cfg->defaultImage);          fprintf(out, "%sset default=\"%d\"\n", indent,
1257     cfg->defaultImage);
1258        } else {
1259     fprintf(out, "%sdefault%s%d\n", indent, separator,
1260     cfg->defaultImage);
1261        }
1262   } else {   } else {
1263      int image = cfg->defaultImage;      int image = cfg->defaultImage;
1264    
# Line 769  static void writeDefault(FILE * out, cha Line 1275  static void writeDefault(FILE * out, cha
1275    
1276      if (!entry) return;      if (!entry) return;
1277    
1278      line = entry->lines;      line = getLineByType(LT_TITLE, entry->lines);
     while (line && line->type != LT_TITLE) line = line->next;  
1279    
1280      if (line && line->numElements >= 2)      if (line && line->numElements >= 2)
1281   fprintf(out, "%sdefault%s%s\n", indent, separator,   fprintf(out, "%sdefault%s%s\n", indent, separator,
# Line 804  static int writeConfig(struct grubConfig Line 1309  static int writeConfig(struct grubConfig
1309      int rc;      int rc;
1310    
1311      /* most likely the symlink is relative, so change our      /* most likely the symlink is relative, so change our
1312         directory to / */         directory to the dir of the symlink */
1313      rc = chdir("/");              rc = chdir(dirname(outName));
1314      do {      do {
1315   buf = alloca(len + 1);   buf = alloca(len + 1);
1316   rc = readlink(outName, buf, len);   rc = readlink(basename(outName), buf, len);
1317   if (rc == len) len += 256;   if (rc == len) len += 256;
1318      } while (rc == len);      } while (rc == len);
1319            
# Line 843  static int writeConfig(struct grubConfig Line 1348  static int writeConfig(struct grubConfig
1348      }      }
1349    
1350      line = cfg->theLines;      line = cfg->theLines;
1351        struct keywordTypes *defaultKw = getKeywordByType(LT_DEFAULT, cfg->cfi);
1352      while (line) {      while (line) {
1353   if (line->type == LT_DEFAULT) {          if (line->type == LT_SET_VARIABLE && defaultKw &&
1354     line->numElements == 3 &&
1355     !strcmp(line->elements[1].item, defaultKw->key)) {
1356        writeDefault(out, line->indent, line->elements[0].indent, cfg);
1357        needs &= ~MAIN_DEFAULT;
1358     } else if (line->type == LT_DEFAULT) {
1359      writeDefault(out, line->indent, line->elements[0].indent, cfg);      writeDefault(out, line->indent, line->elements[0].indent, cfg);
1360      needs &= ~MAIN_DEFAULT;      needs &= ~MAIN_DEFAULT;
1361   } else if (line->type == LT_FALLBACK) {   } else if (line->type == LT_FALLBACK) {
# Line 912  static int numEntries(struct grubConfig Line 1423  static int numEntries(struct grubConfig
1423      return i;      return i;
1424  }  }
1425    
1426    static char *findDiskForRoot()
1427    {
1428        int fd;
1429        char buf[65536];
1430        char *devname;
1431        char *chptr;
1432        int rc;
1433    
1434        if ((fd = open(_PATH_MOUNTED, O_RDONLY)) < 0) {
1435            fprintf(stderr, "grubby: failed to open %s: %s\n",
1436                    _PATH_MOUNTED, strerror(errno));
1437            return NULL;
1438        }
1439    
1440        rc = read(fd, buf, sizeof(buf) - 1);
1441        if (rc <= 0) {
1442            fprintf(stderr, "grubby: failed to read %s: %s\n",
1443                    _PATH_MOUNTED, strerror(errno));
1444            close(fd);
1445            return NULL;
1446        }
1447        close(fd);
1448        buf[rc] = '\0';
1449        chptr = buf;
1450    
1451        char *foundanswer = NULL;
1452    
1453        while (chptr && chptr != buf+rc) {
1454            devname = chptr;
1455    
1456            /*
1457             * The first column of a mtab entry is the device, but if the entry is a
1458             * special device it won't start with /, so move on to the next line.
1459             */
1460            if (*devname != '/') {
1461                chptr = strchr(chptr, '\n');
1462                if (chptr)
1463                    chptr++;
1464                continue;
1465            }
1466    
1467            /* Seek to the next space */
1468            chptr = strchr(chptr, ' ');
1469            if (!chptr) {
1470                fprintf(stderr, "grubby: error parsing %s: %s\n",
1471                        _PATH_MOUNTED, strerror(errno));
1472                return NULL;
1473            }
1474    
1475            /*
1476             * The second column of a mtab entry is the mount point, we are looking
1477             * for '/' obviously.
1478             */
1479            if (*(++chptr) == '/' && *(++chptr) == ' ') {
1480                /* remember the last / entry in mtab */
1481               foundanswer = devname;
1482            }
1483    
1484            /* Next line */
1485            chptr = strchr(chptr, '\n');
1486            if (chptr)
1487                chptr++;
1488        }
1489    
1490        /* Return the last / entry found */
1491        if (foundanswer) {
1492            chptr = strchr(foundanswer, ' ');
1493            *chptr = '\0';
1494            return strdup(foundanswer);
1495        }
1496    
1497        return NULL;
1498    }
1499    
1500    void printEntry(struct singleEntry * entry) {
1501        int i;
1502        struct singleLine * line;
1503    
1504        for (line = entry->lines; line; line = line->next) {
1505     fprintf(stderr, "DBG: %s", line->indent);
1506     for (i = 0; i < line->numElements; i++) {
1507        /* Need to handle this, because we strip the quotes from
1508         * menuentry when read it. */
1509        if (line->type == LT_MENUENTRY && i == 1) {
1510     if(!isquote(*line->elements[i].item))
1511        fprintf(stderr, "\'%s\'", line->elements[i].item);
1512     else
1513        fprintf(stderr, "%s", line->elements[i].item);
1514     fprintf(stderr, "%s", line->elements[i].indent);
1515    
1516     continue;
1517        }
1518        
1519        fprintf(stderr, "%s%s",
1520        line->elements[i].item, line->elements[i].indent);
1521     }
1522     fprintf(stderr, "\n");
1523        }
1524    }
1525    
1526    void notSuitablePrintf(struct singleEntry * entry, const char *fmt, ...)
1527    {
1528        va_list argp;
1529    
1530        if (!debug)
1531     return;
1532    
1533        va_start(argp, fmt);
1534        fprintf(stderr, "DBG: Image entry failed: ");
1535        vfprintf(stderr, fmt, argp);
1536        printEntry(entry);
1537        va_end(argp);
1538    }
1539    
1540    #define beginswith(s, c) ((s) && (s)[0] == (c))
1541    
1542    static int endswith(const char *s, char c)
1543    {
1544     int slen;
1545    
1546     if (!s || !s[0])
1547     return 0;
1548     slen = strlen(s) - 1;
1549    
1550     return s[slen] == c;
1551    }
1552    
1553  int suitableImage(struct singleEntry * entry, const char * bootPrefix,  int suitableImage(struct singleEntry * entry, const char * bootPrefix,
1554    int skipRemoved, int flags) {    int skipRemoved, int flags) {
1555      struct singleLine * line;      struct singleLine * line;
1556      char * fullName;      char * fullName;
1557      int i;      int i;
     struct stat sb, sb2;  
1558      char * dev;      char * dev;
     char * end;  
1559      char * rootspec;      char * rootspec;
1560        char * rootdev;
1561    
1562      line = entry->lines;      if (skipRemoved && entry->skip) {
1563      while (line && line->type != LT_KERNEL) line = line->next;   notSuitablePrintf(entry, "marked to skip\n");
1564         return 0;
1565      if (!line) return 0;      }
1566      if (skipRemoved && entry->skip) return 0;  
1567      if (line->numElements < 2) return 0;      line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);
1568        if (!line) {
1569     notSuitablePrintf(entry, "no line found\n");
1570     return 0;
1571        }
1572        if (line->numElements < 2) {
1573     notSuitablePrintf(entry, "line has only %d elements\n",
1574        line->numElements);
1575     return 0;
1576        }
1577    
1578      if (flags & GRUBBY_BADIMAGE_OKAY) return 1;      if (flags & GRUBBY_BADIMAGE_OKAY) return 1;
1579    
1580      fullName = alloca(strlen(bootPrefix) +      fullName = alloca(strlen(bootPrefix) +
1581        strlen(line->elements[1].item) + 1);        strlen(line->elements[1].item) + 1);
1582      rootspec = getRootSpecifier(line->elements[1].item);      rootspec = getRootSpecifier(line->elements[1].item);
1583      sprintf(fullName, "%s%s", bootPrefix,      int rootspec_offset = rootspec ? strlen(rootspec) : 0;
1584              line->elements[1].item + ((rootspec != NULL) ?      int hasslash = endswith(bootPrefix, '/') ||
1585                                        strlen(rootspec) : 0));       beginswith(line->elements[1].item + rootspec_offset, '/');
1586      if (access(fullName, R_OK)) return 0;      sprintf(fullName, "%s%s%s", bootPrefix, hasslash ? "" : "/",
1587                line->elements[1].item + rootspec_offset);
1588        if (access(fullName, R_OK)) {
1589     notSuitablePrintf(entry, "access to %s failed\n", fullName);
1590     return 0;
1591        }
1592      for (i = 2; i < line->numElements; i++)      for (i = 2; i < line->numElements; i++)
1593   if (!strncasecmp(line->elements[i].item, "root=", 5)) break;   if (!strncasecmp(line->elements[i].item, "root=", 5)) break;
1594      if (i < line->numElements) {      if (i < line->numElements) {
1595   dev = line->elements[i].item + 5;   dev = line->elements[i].item + 5;
1596      } else {      } else {
1597   /* look for a lilo style LT_ROOT line */   /* look for a lilo style LT_ROOT line */
1598   line = entry->lines;   line = getLineByType(LT_ROOT, entry->lines);
  while (line && line->type != LT_ROOT) line = line->next;  
1599    
1600   if (line && line->numElements >= 2) {   if (line && line->numElements >= 2) {
1601      dev = line->elements[1].item;      dev = line->elements[1].item;
1602   } else {   } else {
1603              int type;      /* didn't succeed in finding a LT_ROOT, let's try LT_KERNELARGS.
1604      /* didn't succeed in finding a LT_ROOT, let's try LT_KERNELARGS */       * grub+multiboot uses LT_MBMODULE for the args, so check that too.
1605      line = entry->lines;       */
1606        line = getLineByType(LT_KERNELARGS|LT_MBMODULE, entry->lines);
             type = ((entry->multiboot) ? LT_MBMODULE : LT_KERNELARGS);  
   
     while (line && line->type != type) line = line->next;  
1607    
1608              /* failed to find one */              /* failed to find one */
1609              if (!line) return 0;              if (!line) {
1610     notSuitablePrintf(entry, "no line found\n");
1611     return 0;
1612                }
1613    
1614      for (i = 1; i < line->numElements; i++)      for (i = 1; i < line->numElements; i++)
1615          if (!strncasecmp(line->elements[i].item, "root=", 5)) break;          if (!strncasecmp(line->elements[i].item, "root=", 5)) break;
1616      if (i < line->numElements)      if (i < line->numElements)
1617          dev = line->elements[i].item + 5;          dev = line->elements[i].item + 5;
1618      else {      else {
1619     notSuitablePrintf(entry, "no root= entry found\n");
1620   /* it failed too...  can't find root= */   /* it failed too...  can't find root= */
1621          return 0;          return 0;
1622              }              }
1623   }   }
1624      }      }
1625    
1626      if (!strncmp(dev, "LABEL=", 6)) {      dev = getpathbyspec(dev);
1627   dev += 6;      if (!getpathbyspec(dev)) {
1628            notSuitablePrintf(entry, "can't find blkid entry for %s\n", dev);
1629   /* check which device has this label */          return 0;
1630   dev = get_spec_by_volume_label(dev, &i, &i);      } else
1631   if (!dev) return 0;   dev = getpathbyspec(dev);
1632    
1633        rootdev = findDiskForRoot();
1634        if (!rootdev) {
1635            notSuitablePrintf(entry, "can't find root device\n");
1636     return 0;
1637      }      }
1638    
1639      if (*dev == '/') {      if (!getuuidbydev(rootdev) || !getuuidbydev(dev)) {
1640   if (stat(dev, &sb))          notSuitablePrintf(entry, "uuid missing: rootdev %s, dev %s\n",
1641      return 0;   getuuidbydev(rootdev), getuuidbydev(dev));
1642      } else {          free(rootdev);
1643   sb.st_rdev = strtol(dev, &end, 16);          return 0;
1644   if (*end) return 0;      }
1645    
1646        if (strcmp(getuuidbydev(rootdev), getuuidbydev(dev))) {
1647            notSuitablePrintf(entry, "uuid mismatch: rootdev %s, dev %s\n",
1648     getuuidbydev(rootdev), getuuidbydev(dev));
1649     free(rootdev);
1650            return 0;
1651      }      }
     stat("/", &sb2);  
1652    
1653      if (sb.st_rdev != sb2.st_dev) return 0;      free(rootdev);
1654    
1655      return 1;      return 1;
1656  }  }
# Line 1034  struct singleEntry * findEntryByPath(str Line 1694  struct singleEntry * findEntryByPath(str
1694   entry = findEntryByIndex(config, indexVars[i]);   entry = findEntryByIndex(config, indexVars[i]);
1695   if (!entry) return NULL;   if (!entry) return NULL;
1696    
1697   line = entry->lines;   line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);
  while (line && line->type != LT_KERNEL)  
     line = line->next;  
   
1698   if (!line) return NULL;   if (!line) return NULL;
1699    
1700   if (index) *index = indexVars[i];   if (index) *index = indexVars[i];
# Line 1075  struct singleEntry * findEntryByPath(str Line 1732  struct singleEntry * findEntryByPath(str
1732    
1733   if (!strncmp(kernel, "TITLE=", 6)) {   if (!strncmp(kernel, "TITLE=", 6)) {
1734      prefix = "";      prefix = "";
1735      checkType = LT_TITLE;      checkType = LT_TITLE|LT_MENUENTRY;
1736      kernel += 6;      kernel += 6;
1737   }   }
1738    
1739   while ((entry = findEntryByIndex(config, i))) {   for (entry = findEntryByIndex(config, i); entry; entry = entry->next, i++) {
1740      line = entry->lines;      if (entry->skip) continue;
     while (line && line->type != checkType) line=line->next;  
   
1741    
1742      if (line && line->numElements >= 2 && !entry->skip) {      dbgPrintf("findEntryByPath looking for %d %s in %p\n", checkType, kernel, entry);
                 rootspec = getRootSpecifier(line->elements[1].item);  
         if (!strcmp(line->elements[1].item  +  
                             ((rootspec != NULL) ? strlen(rootspec) : 0),  
                             kernel + strlen(prefix)))  
                     break;  
             }  
               
             /* have to check multiboot lines too */  
             if (entry->multiboot) {  
                 while (line && line->type != LT_MBMODULE) line = line->next;  
                 if (line && line->numElements >= 2 && !entry->skip) {  
                     rootspec = getRootSpecifier(line->elements[1].item);  
                     if (!strcmp(line->elements[1].item  +  
                                 ((rootspec != NULL) ? strlen(rootspec) : 0),  
                                 kernel + strlen(prefix)))  
                         break;  
                 }  
             }  
1743    
1744      i++;      /* check all the lines matching checkType */
1745        for (line = entry->lines; line; line = line->next) {
1746     line = getLineByType(entry->multiboot && checkType == LT_KERNEL ?
1747         LT_KERNEL|LT_MBMODULE|LT_HYPER :
1748         checkType, line);
1749     if (!line) break;  /* not found in this entry */
1750    
1751     if (line && line->type != LT_MENUENTRY &&
1752     line->numElements >= 2) {
1753        rootspec = getRootSpecifier(line->elements[1].item);
1754        if (!strcmp(line->elements[1].item +
1755     ((rootspec != NULL) ? strlen(rootspec) : 0),
1756     kernel + strlen(prefix)))
1757     break;
1758     }
1759     if(line->type == LT_MENUENTRY &&
1760     !strcmp(line->elements[1].item, kernel))
1761        break;
1762        }
1763    
1764        /* make sure this entry has a kernel identifier; this skips
1765         * non-Linux boot entries (could find netbsd etc, though, which is
1766         * unfortunate)
1767         */
1768        if (line && getLineByType(LT_KERNEL|LT_HYPER, entry->lines))
1769     break; /* found 'im! */
1770   }   }
1771    
1772   if (index) *index = i;   if (index) *index = i;
1773      }      }
1774    
     if (!entry) return NULL;  
   
     /* make sure this entry has a kernel identifier; this skips non-Linux  
        boot entries (could find netbsd etc, though, which is unfortunate) */  
     line = entry->lines;  
     while (line && line->type != LT_KERNEL) line = line->next;  
     if (!line) {  
  if (!index) index = &i;  
  (*index)++;  
  return findEntryByPath(config, kernel, prefix, index);  
     }  
   
1775      return entry;      return entry;
1776  }  }
1777    
# Line 1200  void markRemovedImage(struct grubConfig Line 1850  void markRemovedImage(struct grubConfig
1850        const char * prefix) {        const char * prefix) {
1851      struct singleEntry * entry;      struct singleEntry * entry;
1852    
1853      if (!image) return;      if (!image)
1854     return;
1855    
1856        /* check and see if we're removing the default image */
1857        if (isdigit(*image)) {
1858     entry = findEntryByPath(cfg, image, prefix, NULL);
1859     if(entry)
1860        entry->skip = 1;
1861     return;
1862        }
1863    
1864      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))
1865   entry->skip = 1;   entry->skip = 1;
# Line 1227  void setDefaultImage(struct grubConfig * Line 1886  void setDefaultImage(struct grubConfig *
1886    
1887      /* 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
1888         changes */         changes */
1889      if (config->defaultImage == DEFAULT_SAVED)      if ((config->defaultImage == DEFAULT_SAVED) ||
1890     (config->defaultImage == DEFAULT_SAVED_GRUB2))
1891        /* default is set to saved, we don't want to change it */        /* default is set to saved, we don't want to change it */
1892        return;        return;
1893    
# Line 1286  void displayEntry(struct singleEntry * e Line 1946  void displayEntry(struct singleEntry * e
1946      char * root = NULL;      char * root = NULL;
1947      int i;      int i;
1948    
     line = entry->lines;  
     while (line && line->type != LT_KERNEL) line = line->next;  
   
1949      printf("index=%d\n", index);      printf("index=%d\n", index);
1950    
1951      printf("kernel=%s\n", line->elements[1].item);      line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);
1952        if (!line) {
1953            printf("non linux entry\n");
1954            return;
1955        }
1956    
1957        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
1958     printf("kernel=%s\n", line->elements[1].item);
1959        else
1960     printf("kernel=%s%s\n", prefix, line->elements[1].item);
1961    
1962      if (line->numElements >= 3) {      if (line->numElements >= 3) {
1963   printf("args=\"");   printf("args=\"");
# Line 1308  void displayEntry(struct singleEntry * e Line 1974  void displayEntry(struct singleEntry * e
1974   }   }
1975   printf("\"\n");   printf("\"\n");
1976      } else {      } else {
1977   line = entry->lines;   line = getLineByType(LT_KERNELARGS, entry->lines);
  while (line && line->type != LT_KERNELARGS) line=line->next;  
   
1978   if (line) {   if (line) {
1979      char * s;      char * s;
1980    
# Line 1334  void displayEntry(struct singleEntry * e Line 1998  void displayEntry(struct singleEntry * e
1998      }      }
1999    
2000      if (!root) {      if (!root) {
2001   line = entry->lines;   line = getLineByType(LT_ROOT, entry->lines);
  while (line && line->type != LT_ROOT) line = line->next;  
   
2002   if (line && line->numElements >= 2)   if (line && line->numElements >= 2)
2003      root=line->elements[1].item;      root=line->elements[1].item;
2004      }      }
# Line 1351  void displayEntry(struct singleEntry * e Line 2013  void displayEntry(struct singleEntry * e
2013   printf("root=%s\n", s);   printf("root=%s\n", s);
2014      }      }
2015    
2016      line = entry->lines;      line = getLineByType(LT_INITRD, entry->lines);
     while (line && line->type != LT_INITRD) line = line->next;  
2017    
2018      if (line && line->numElements >= 2) {      if (line && line->numElements >= 2) {
2019   printf("initrd=%s", prefix);   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
2020        printf("initrd=");
2021     else
2022        printf("initrd=%s", prefix);
2023    
2024   for (i = 1; i < line->numElements; i++)   for (i = 1; i < line->numElements; i++)
2025      printf("%s%s", line->elements[i].item, line->elements[i].indent);      printf("%s%s", line->elements[i].item, line->elements[i].indent);
2026   printf("\n");   printf("\n");
2027      }      }
2028    
2029        line = getLineByType(LT_TITLE, entry->lines);
2030        if (line) {
2031     printf("title=%s\n", line->elements[1].item);
2032        } else {
2033     char * title;
2034     line = getLineByType(LT_MENUENTRY, entry->lines);
2035     title = grub2ExtractTitle(line);
2036     if (title)
2037        printf("title=%s\n", title);
2038        }
2039  }  }
2040    
2041  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {
# Line 1369  int parseSysconfigGrub(int * lbaPtr, cha Line 2045  int parseSysconfigGrub(int * lbaPtr, cha
2045      char * start;      char * start;
2046      char * param;      char * param;
2047    
2048      in = fopen("/etc/sysconfig/grub", "r");      in = fopen("/etc/conf.d/grub", "r");
2049      if (!in) return 1;      if (!in) return 1;
2050    
2051      if (lbaPtr) *lbaPtr = 0;      if (lbaPtr) *lbaPtr = 0;
# Line 1431  int displayInfo(struct grubConfig * conf Line 2107  int displayInfo(struct grubConfig * conf
2107   return 1;   return 1;
2108      }      }
2109    
2110      /* this is a horrible hack to support /etc/sysconfig/grub; there must      /* this is a horrible hack to support /etc/conf.d/grub; there must
2111         be a better way */         be a better way */
2112      if (config->cfi == &grubConfigType) {      if (config->cfi == &grubConfigType) {
2113   dumpSysconfigGrub();   dumpSysconfigGrub();
2114      } else {      } else {
2115   line = config->theLines;   line = getLineByType(LT_BOOT, config->theLines);
  while (line && line->type != LT_BOOT) line = line->next;  
2116   if (line && line->numElements >= 1) {   if (line && line->numElements >= 1) {
2117      printf("boot=%s\n", line->elements[1].item);      printf("boot=%s\n", line->elements[1].item);
2118   }   }
2119    
2120   line = config->theLines;   line = getLineByType(LT_LBA, config->theLines);
  while (line && line->type != LT_LBA) line = line->next;  
2121   if (line) printf("lba\n");   if (line) printf("lba\n");
2122      }      }
2123    
# Line 1458  int displayInfo(struct grubConfig * conf Line 2132  int displayInfo(struct grubConfig * conf
2132      return 0;      return 0;
2133  }  }
2134    
2135    struct singleLine * addLineTmpl(struct singleEntry * entry,
2136     struct singleLine * tmplLine,
2137     struct singleLine * prevLine,
2138     const char * val,
2139     struct configFileInfo * cfi)
2140    {
2141        struct singleLine * newLine = lineDup(tmplLine);
2142    
2143        if (val) {
2144     /* override the inherited value with our own.
2145     * This is a little weak because it only applies to elements[1]
2146     */
2147     if (newLine->numElements > 1)
2148        removeElement(newLine, 1);
2149     insertElement(newLine, val, 1, cfi);
2150    
2151     /* but try to keep the rootspec from the template... sigh */
2152     if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD)) {
2153        char * rootspec = getRootSpecifier(tmplLine->elements[1].item);
2154        if (rootspec != NULL) {
2155     free(newLine->elements[1].item);
2156     newLine->elements[1].item =
2157        sdupprintf("%s%s", rootspec, val);
2158        }
2159     }
2160        }
2161    
2162        dbgPrintf("addLineTmpl(%s)\n", newLine->numElements ?
2163          newLine->elements[0].item : "");
2164    
2165        if (!entry->lines) {
2166     /* first one on the list */
2167     entry->lines = newLine;
2168        } else if (prevLine) {
2169     /* add after prevLine */
2170     newLine->next = prevLine->next;
2171     prevLine->next = newLine;
2172        }
2173    
2174        return newLine;
2175    }
2176    
2177  /* val may be NULL */  /* val may be NULL */
2178  struct singleLine *  addLine(struct singleEntry * entry,  struct singleLine *  addLine(struct singleEntry * entry,
2179       struct configFileInfo * cfi,       struct configFileInfo * cfi,
2180       enum lineType_e type, const char * defaultIndent,       enum lineType_e type, char * defaultIndent,
2181       char * val) {       const char * val) {
2182      struct singleLine * line, * prev;      struct singleLine * line, * prev;
2183      int i;      struct keywordTypes * kw;
2184        struct singleLine tmpl;
2185    
2186      for (i = 0; cfi->keywords[i].key; i++)      /* NB: This function shouldn't allocate items on the heap, rather on the
2187   if (cfi->keywords[i].type == type) break;       * stack since it calls addLineTmpl which will make copies.
2188      if (type != LT_TITLE || !cfi->titleBracketed)       */
2189          if (!cfi->keywords[i].key) abort();  
2190        if (type == LT_TITLE && cfi->titleBracketed) {
2191     /* we're doing a bracketed title (zipl) */
2192     tmpl.type = type;
2193     tmpl.numElements = 1;
2194     tmpl.elements = alloca(sizeof(*tmpl.elements));
2195     tmpl.elements[0].item = alloca(strlen(val)+3);
2196     sprintf(tmpl.elements[0].item, "[%s]", val);
2197     tmpl.elements[0].indent = "";
2198     val = NULL;
2199        } else if (type == LT_MENUENTRY) {
2200     char *lineend = "--class gnu-linux --class gnu --class os {";
2201     if (!val) {
2202        fprintf(stderr, "Line type LT_MENUENTRY requires a value\n");
2203        abort();
2204     }
2205     kw = getKeywordByType(type, cfi);
2206     if (!kw) {
2207        fprintf(stderr, "Looking up keyword for unknown type %d\n", type);
2208        abort();
2209     }
2210     tmpl.indent = "";
2211     tmpl.type = type;
2212     tmpl.numElements = 3;
2213     tmpl.elements = alloca(sizeof(*tmpl.elements) * tmpl.numElements);
2214     tmpl.elements[0].item = kw->key;
2215     tmpl.elements[0].indent = alloca(2);
2216     sprintf(tmpl.elements[0].indent, "%c", kw->nextChar);
2217     tmpl.elements[1].item = (char *)val;
2218     tmpl.elements[1].indent = alloca(2);
2219     sprintf(tmpl.elements[1].indent, "%c", kw->nextChar);
2220     tmpl.elements[2].item = alloca(strlen(lineend)+1);
2221     strcpy(tmpl.elements[2].item, lineend);
2222     tmpl.elements[2].indent = "";
2223        } else {
2224     kw = getKeywordByType(type, cfi);
2225     if (!kw) {
2226        fprintf(stderr, "Looking up keyword for unknown type %d\n", type);
2227        abort();
2228     }
2229     tmpl.type = type;
2230     tmpl.numElements = val ? 2 : 1;
2231     tmpl.elements = alloca(sizeof(*tmpl.elements) * tmpl.numElements);
2232     tmpl.elements[0].item = kw->key;
2233     tmpl.elements[0].indent = alloca(2);
2234     sprintf(tmpl.elements[0].indent, "%c", kw->nextChar);
2235     if (val) {
2236        tmpl.elements[1].item = (char *)val;
2237        tmpl.elements[1].indent = "";
2238     }
2239        }
2240    
2241      /* The last non-empty line gives us the indention to us and the line      /* The last non-empty line gives us the indention to us and the line
2242         to insert after. Note that comments are considered empty lines, which         to insert after. Note that comments are considered empty lines, which
2243         may not be ideal? If there are no lines or we are looking at the         may not be ideal? If there are no lines or we are looking at the
2244         first line, we use defaultIndent (the first line is normally indented         first line, we use defaultIndent (the first line is normally indented
2245         differently from the rest) */         differently from the rest) */
2246      if (entry->lines) {      for (line = entry->lines, prev = NULL; line; line = line->next) {
2247   line = entry->lines;   if (line->numElements) prev = line;
2248   prev = NULL;   /* fall back on the last line if prev isn't otherwise set */
2249   while (line) {   if (!line->next && !prev) prev = line;
     if (line->numElements) prev = line;  
     line = line->next;  
  }  
  if (!prev) {  
     /* just use the last line */  
     prev = entry->lines;  
     while (prev->next) prev = prev->next;  
  }  
   
  line = prev->next;  
  prev->next = malloc(sizeof(*line));  
  prev->next->next = line;  
  line = prev->next;  
   
  if (prev == entry->lines)  
     line->indent = strdup(defaultIndent);  
  else  
     line->indent = strdup(prev->indent);  
     } else {  
  line = malloc(sizeof(*line));  
  line->indent = strdup(defaultIndent);  
  line->next = NULL;  
2250      }      }
2251    
2252      if (type != LT_TITLE || !cfi->titleBracketed) {      struct singleLine *menuEntry;
2253          line->type = type;      menuEntry = getLineByType(LT_MENUENTRY, entry->lines);
2254          line->numElements = val ? 2 : 1;      if (tmpl.type == LT_ENTRY_END) {
2255          line->elements = malloc(sizeof(*line->elements) * line->numElements);   if (menuEntry)
2256          line->elements[0].item = strdup(cfi->keywords[i].key);      tmpl.indent = menuEntry->indent;
2257          line->elements[0].indent = malloc(2);   else
2258          line->elements[0].indent[0] = cfi->keywords[i].nextChar;      tmpl.indent = defaultIndent ?: "";
2259          line->elements[0].indent[1] = '\0';      } else if (tmpl.type != LT_MENUENTRY) {
2260             if (menuEntry)
2261          if (val) {      tmpl.indent = "\t";
2262              line->elements[1].item = val;   else if (prev == entry->lines)
2263              line->elements[1].indent = strdup("");      tmpl.indent = defaultIndent ?: "";
2264          }   else
2265      } else {      tmpl.indent = prev->indent;
         /* we're doing the title of a bracketed title (zipl) */  
         line->type = type;  
         line->numElements = 1;  
         line->elements = malloc(sizeof(*line->elements) * line->numElements);  
   
         line->elements[0].item = malloc(strlen(val) + 3);  
         sprintf(line->elements[0].item, "[%s]", val);  
         line->elements[0].indent = strdup("");  
2266      }      }
2267    
2268      return line;      return addLineTmpl(entry, &tmpl, prev, val, cfi);
2269  }  }
2270    
2271  void removeLine(struct singleEntry * entry, struct singleLine * line) {  void removeLine(struct singleEntry * entry, struct singleLine * line) {
# Line 1553  void removeLine(struct singleEntry * ent Line 2290  void removeLine(struct singleEntry * ent
2290      free(line);      free(line);
2291  }  }
2292    
2293    static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)
2294    {
2295        struct singleLine newLine = {
2296     .indent = tmplLine->indent,
2297     .type = tmplLine->type,
2298     .next = tmplLine->next,
2299        };
2300        int firstQuotedItem = -1;
2301        int quoteLen = 0;
2302        int j;
2303        int element = 0;
2304        char *c;
2305    
2306        c = malloc(strlen(tmplLine->elements[0].item) + 1);
2307        strcpy(c, tmplLine->elements[0].item);
2308        insertElement(&newLine, c, element++, cfi);
2309        free(c);
2310        c = NULL;
2311    
2312        for (j = 1; j < tmplLine->numElements; j++) {
2313     if (firstQuotedItem == -1) {
2314        quoteLen += strlen(tmplLine->elements[j].item);
2315        
2316        if (isquote(tmplLine->elements[j].item[0])) {
2317     firstQuotedItem = j;
2318            quoteLen += strlen(tmplLine->elements[j].indent);
2319        } else {
2320     c = malloc(quoteLen + 1);
2321     strcpy(c, tmplLine->elements[j].item);
2322     insertElement(&newLine, c, element++, cfi);
2323     free(c);
2324     quoteLen = 0;
2325        }
2326     } else {
2327        int itemlen = strlen(tmplLine->elements[j].item);
2328        quoteLen += itemlen;
2329        quoteLen += strlen(tmplLine->elements[j].indent);
2330        
2331        if (isquote(tmplLine->elements[j].item[itemlen - 1])) {
2332     c = malloc(quoteLen + 1);
2333     c[0] = '\0';
2334     for (int i = firstQuotedItem; i < j+1; i++) {
2335        strcat(c, tmplLine->elements[i].item);
2336        strcat(c, tmplLine->elements[i].indent);
2337     }
2338     insertElement(&newLine, c, element++, cfi);
2339     free(c);
2340    
2341     firstQuotedItem = -1;
2342     quoteLen = 0;
2343        }
2344     }
2345        }
2346        while (tmplLine->numElements)
2347     removeElement(tmplLine, 0);
2348        if (tmplLine->elements)
2349     free(tmplLine->elements);
2350    
2351        tmplLine->numElements = newLine.numElements;
2352        tmplLine->elements = newLine.elements;
2353    }
2354    
2355    static void insertElement(struct singleLine * line,
2356      const char * item, int insertHere,
2357      struct configFileInfo * cfi)
2358    {
2359        struct keywordTypes * kw;
2360        char indent[2] = "";
2361    
2362        /* sanity check */
2363        if (insertHere > line->numElements) {
2364     dbgPrintf("insertElement() adjusting insertHere from %d to %d\n",
2365      insertHere, line->numElements);
2366     insertHere = line->numElements;
2367        }
2368    
2369        line->elements = realloc(line->elements, (line->numElements + 1) *
2370         sizeof(*line->elements));
2371        memmove(&line->elements[insertHere+1],
2372        &line->elements[insertHere],
2373        (line->numElements - insertHere) *
2374        sizeof(*line->elements));
2375        line->elements[insertHere].item = strdup(item);
2376    
2377        kw = getKeywordByType(line->type, cfi);
2378    
2379        if (line->numElements == 0) {
2380     indent[0] = '\0';
2381        } else if (insertHere == 0) {
2382     indent[0] = kw->nextChar;
2383        } else if (kw->separatorChar != '\0') {
2384     indent[0] = kw->separatorChar;
2385        } else {
2386     indent[0] = ' ';
2387        }
2388    
2389        if (insertHere > 0 && line->elements[insertHere-1].indent[0] == '\0') {
2390     /* move the end-of-line forward */
2391     line->elements[insertHere].indent =
2392        line->elements[insertHere-1].indent;
2393     line->elements[insertHere-1].indent = strdup(indent);
2394        } else {
2395     line->elements[insertHere].indent = strdup(indent);
2396        }
2397    
2398        line->numElements++;
2399    
2400        dbgPrintf("insertElement(%s, '%s%s', %d)\n",
2401          line->elements[0].item,
2402          line->elements[insertHere].item,
2403          line->elements[insertHere].indent,
2404          insertHere);
2405    }
2406    
2407    static void removeElement(struct singleLine * line, int removeHere) {
2408        int i;
2409    
2410        /* sanity check */
2411        if (removeHere >= line->numElements) return;
2412    
2413        dbgPrintf("removeElement(%s, %d:%s)\n", line->elements[0].item,
2414          removeHere, line->elements[removeHere].item);
2415    
2416        free(line->elements[removeHere].item);
2417    
2418        if (removeHere > 1) {
2419     /* previous argument gets this argument's post-indentation */
2420     free(line->elements[removeHere-1].indent);
2421     line->elements[removeHere-1].indent =
2422        line->elements[removeHere].indent;
2423        } else {
2424     free(line->elements[removeHere].indent);
2425        }
2426    
2427        /* now collapse the array, but don't bother to realloc smaller */
2428        for (i = removeHere; i < line->numElements - 1; i++)
2429     line->elements[i] = line->elements[i + 1];
2430    
2431        line->numElements--;
2432    }
2433    
2434  int argMatch(const char * one, const char * two) {  int argMatch(const char * one, const char * two) {
2435      char * first, * second;      char * first, * second;
2436      char * chptr;      char * chptr;
# Line 1575  int updateActualImage(struct grubConfig Line 2453  int updateActualImage(struct grubConfig
2453      struct singleEntry * entry;      struct singleEntry * entry;
2454      struct singleLine * line, * rootLine;      struct singleLine * line, * rootLine;
2455      int index = 0;      int index = 0;
2456      int i, j, k;      int i, k;
2457      const char ** newArgs, ** oldArgs;      const char ** newArgs, ** oldArgs;
2458      const char ** arg;      const char ** arg;
2459      const char * chptr;      int useKernelArgs, useRoot;
     int useKernelArgs = 0;  
     int useRoot = 0;  
2460      int firstElement;      int firstElement;
2461      int *usedElements, *usedArgs;      int *usedElements;
2462        int doreplace;
2463    
2464      if (!image) return 0;      if (!image) return 0;
2465    
# Line 1609  int updateActualImage(struct grubConfig Line 2486  int updateActualImage(struct grubConfig
2486   }   }
2487      }      }
2488    
     for (i = 0; cfg->cfi->keywords[i].key; i++)  
  if (cfg->cfi->keywords[i].type == LT_KERNELARGS) break;  
2489    
2490      if (cfg->cfi->keywords[i].key)      useKernelArgs = (getKeywordByType(LT_KERNELARGS, cfg->cfi)
2491   useKernelArgs = 1;       && (!multibootArgs || cfg->cfi->mbConcatArgs));
2492    
2493      for (i = 0; cfg->cfi->keywords[i].key; i++)      useRoot = (getKeywordByType(LT_ROOT, cfg->cfi)
2494   if (cfg->cfi->keywords[i].type == LT_ROOT) break;         && !multibootArgs);
2495    
2496      if (cfg->cfi->keywords[i].key)      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
  useRoot = 1;  
2497    
2498      k = 0;   if (multibootArgs && !entry->multiboot)
2499      for (arg = newArgs; *arg; arg++)      continue;
2500          k++;  
2501      usedArgs = calloc(k, sizeof(int));   /* Determine where to put the args.  If this config supports
2502     * LT_KERNELARGS, use that.  Otherwise use
2503     * LT_HYPER/LT_KERNEL/LT_MBMODULE lines.
2504     */
2505     if (useKernelArgs) {
2506        line = getLineByType(LT_KERNELARGS, entry->lines);
2507        if (!line) {
2508     /* no LT_KERNELARGS, need to add it */
2509     line = addLine(entry, cfg->cfi, LT_KERNELARGS,
2510           cfg->secondaryIndent, NULL);
2511        }
2512        firstElement = 1;
2513    
2514      while ((entry = findEntryByPath(cfg, image, prefix, &index))) {   } else if (multibootArgs) {
2515   index++;      line = getLineByType(LT_HYPER, entry->lines);
2516        if (!line) {
2517     /* a multiboot entry without LT_HYPER? */
2518     continue;
2519        }
2520        firstElement = 2;
2521    
2522   line = entry->lines;   } else {
2523   while (line && line->type != LT_KERNEL) line = line->next;      line = getLineByType(LT_KERNEL|LT_MBMODULE, entry->lines);
2524   if (!line) continue;      if (!line) {
2525   firstElement = 2;   /* no LT_KERNEL or LT_MBMODULE in this entry? */
2526     continue;
2527          if (entry->multiboot && !multibootArgs) {      }
2528              /* first mb module line is the real kernel */      firstElement = 2;
             while (line && line->type != LT_MBMODULE) line = line->next;  
             firstElement = 2;  
         } else if (useKernelArgs) {  
     while (line && line->type != LT_KERNELARGS) line = line->next;  
     firstElement = 1;  
2529   }   }
2530    
2531   if (!line && useKernelArgs) {   /* handle the elilo case which does:
2532      /* no append in there, need to add it */   *   append="hypervisor args -- kernel args"
2533      line = addLine(entry, cfg->cfi, LT_KERNELARGS, NULL, NULL);   */
2534     if (entry->multiboot && cfg->cfi->mbConcatArgs) {
2535        /* this is a multiboot entry, make sure there's
2536         * -- on the args line
2537         */
2538        for (i = firstElement; i < line->numElements; i++) {
2539     if (!strcmp(line->elements[i].item, "--"))
2540        break;
2541        }
2542        if (i == line->numElements) {
2543     /* assume all existing args are kernel args,
2544     * prepend -- to make it official
2545     */
2546     insertElement(line, "--", firstElement, cfg->cfi);
2547     i = firstElement;
2548        }
2549        if (!multibootArgs) {
2550     /* kernel args start after the -- */
2551     firstElement = i + 1;
2552        }
2553     } else if (cfg->cfi->mbConcatArgs) {
2554        /* this is a non-multiboot entry, remove hyper args */
2555        for (i = firstElement; i < line->numElements; i++) {
2556     if (!strcmp(line->elements[i].item, "--"))
2557        break;
2558        }
2559        if (i < line->numElements) {
2560     /* remove args up to -- */
2561     while (strcmp(line->elements[firstElement].item, "--"))
2562        removeElement(line, firstElement);
2563     /* remove -- */
2564     removeElement(line, firstElement);
2565        }
2566   }   }
2567    
2568          usedElements = calloc(line->numElements, sizeof(int));          usedElements = calloc(line->numElements, sizeof(*usedElements));
2569    
2570          k = 0;   for (k = 0, arg = newArgs; *arg; arg++, k++) {
2571   for (arg = newArgs; *arg; arg++) {  
2572              if (usedArgs[k]) {      doreplace = 1;
                 k++;  
                 continue;  
             }  
2573      for (i = firstElement; i < line->numElements; i++) {      for (i = firstElement; i < line->numElements; i++) {
2574     if (multibootArgs && cfg->cfi->mbConcatArgs &&
2575        !strcmp(line->elements[i].item, "--"))
2576     {
2577        /* reached the end of hyper args, insert here */
2578        doreplace = 0;
2579        break;  
2580     }
2581                  if (usedElements[i])                  if (usedElements[i])
2582                      continue;                      continue;
2583   if (!argMatch(line->elements[i].item, *arg)) {   if (!argMatch(line->elements[i].item, *arg)) {
2584                      usedElements[i]=1;                      usedElements[i]=1;
                     usedArgs[k]=1;  
2585      break;      break;
2586                  }                  }
2587              }              }
     chptr = strchr(*arg, '=');  
2588    
2589      if (i < line->numElements) {      if (i < line->numElements && doreplace) {
2590   /* replace */   /* direct replacement */
2591   free(line->elements[i].item);   free(line->elements[i].item);
2592   line->elements[i].item = strdup(*arg);   line->elements[i].item = strdup(*arg);
     } else if (useRoot && !strncmp(*arg, "root=/dev/", 10) && *chptr) {  
  rootLine = entry->lines;  
  while (rootLine && rootLine->type != LT_ROOT)  
     rootLine = rootLine->next;  
  if (!rootLine) {  
     rootLine = addLine(entry, cfg->cfi, LT_ROOT, NULL, NULL);  
     rootLine->elements = realloc(rootLine->elements,  
     2 * sizeof(*rootLine->elements));  
     rootLine->numElements++;  
     rootLine->elements[1].indent = strdup("");  
     rootLine->elements[1].item = strdup("");  
  }  
2593    
2594   free(rootLine->elements[1].item);      } else if (useRoot && !strncmp(*arg, "root=/dev/", 10)) {
2595   rootLine->elements[1].item = strdup(chptr + 1);   /* root= replacement */
2596      } else {   rootLine = getLineByType(LT_ROOT, entry->lines);
2597   /* append */   if (rootLine) {
2598   line->elements = realloc(line->elements,      free(rootLine->elements[1].item);
2599   (line->numElements + 1) * sizeof(*line->elements));      rootLine->elements[1].item = strdup(*arg + 5);
  line->elements[line->numElements].item = strdup(*arg);  
  usedElements = realloc(usedElements,  
  (line->numElements + 1) * sizeof(int));  
  usedElements[line->numElements] = 1;  
   
  if (line->numElements > 1) {  
     /* add to existing list of arguments */  
     line->elements[line->numElements].indent =  
  line->elements[line->numElements - 1].indent;  
     line->elements[line->numElements - 1].indent = strdup(" ");  
2600   } else {   } else {
2601      /* First thing on this line; treat a bit differently. Note      rootLine = addLine(entry, cfg->cfi, LT_ROOT,
2602         this is only possible if we've added a LT_KERNELARGS         cfg->secondaryIndent, *arg + 5);
        entry */  
     line->elements[line->numElements].indent = strdup("");  
2603   }   }
2604        }
2605    
2606   line->numElements++;      else {
2607     /* insert/append */
2608     insertElement(line, *arg, i, cfg->cfi);
2609     usedElements = realloc(usedElements, line->numElements *
2610           sizeof(*usedElements));
2611     memmove(&usedElements[i + 1], &usedElements[i],
2612     line->numElements - i - 1);
2613     usedElements[i] = 1;
2614    
2615   /* if we updated a root= here even though there is a   /* if we updated a root= here even though there is a
2616     LT_ROOT available we need to remove the LT_ROOT entry     LT_ROOT available we need to remove the LT_ROOT entry
2617     (this will happen if we switch from a device to a label) */     (this will happen if we switch from a device to a label) */
2618   if (useRoot && !strncmp(*arg, "root=", 5)) {   if (useRoot && !strncmp(*arg, "root=", 5)) {
2619      rootLine = entry->lines;      rootLine = getLineByType(LT_ROOT, entry->lines);
2620      while (rootLine && rootLine->type != LT_ROOT)      if (rootLine)
  rootLine = rootLine->next;  
     if (rootLine) {  
2621   removeLine(entry, rootLine);   removeLine(entry, rootLine);
     }  
2622   }   }
2623      }      }
             k++;  
2624   }   }
2625    
2626          free(usedElements);          free(usedElements);
2627    
  /* no arguments to remove (i.e. no append line) */  
  if (!line) continue;  
   
  /* this won't remove an LT_ROOT item properly (but then again,  
    who cares? */  
2628   for (arg = oldArgs; *arg; arg++) {   for (arg = oldArgs; *arg; arg++) {
2629      for (i = firstElement; i < line->numElements; i++)      for (i = firstElement; i < line->numElements; i++) {
2630   if (!argMatch(line->elements[i].item, *arg))   if (multibootArgs && cfg->cfi->mbConcatArgs &&
2631        !strcmp(line->elements[i].item, "--"))
2632        /* reached the end of hyper args, stop here */
2633        break;
2634     if (!argMatch(line->elements[i].item, *arg)) {
2635        removeElement(line, i);
2636      break;      break;
   
     if (i < line->numElements) {  
  /* if this isn't the first argument the previous argument  
    gets this arguments post-indention */  
  if (i > firstElement) {  
     free(line->elements[i - 1].indent);  
     line->elements[i - 1].indent = line->elements[i].indent;  
2637   }   }
2638        }
2639   free(line->elements[i].item);      /* handle removing LT_ROOT line too */
2640        if (useRoot && !strncmp(*arg, "root=", 5)) {
2641   for (j = i + 1; j < line->numElements; j++)   rootLine = getLineByType(LT_ROOT, entry->lines);
2642      line->elements[j - 1] = line->elements[j];   if (rootLine)
2643        removeLine(entry, rootLine);
  line->numElements--;  
2644      }      }
2645   }   }
2646    
# Line 1760  int updateActualImage(struct grubConfig Line 2651  int updateActualImage(struct grubConfig
2651   }   }
2652      }      }
2653    
     free(usedArgs);  
2654      free(newArgs);      free(newArgs);
2655      free(oldArgs);      free(oldArgs);
2656    
# Line 1786  int updateImage(struct grubConfig * cfg, Line 2676  int updateImage(struct grubConfig * cfg,
2676      return rc;      return rc;
2677  }  }
2678    
2679    int updateInitrd(struct grubConfig * cfg, const char * image,
2680                     const char * prefix, const char * initrd) {
2681        struct singleEntry * entry;
2682        struct singleLine * line, * kernelLine, *endLine = NULL;
2683        int index = 0;
2684    
2685        if (!image) return 0;
2686    
2687        for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
2688            kernelLine = getLineByType(LT_KERNEL, entry->lines);
2689            if (!kernelLine) continue;
2690    
2691            line = getLineByType(LT_INITRD, entry->lines);
2692            if (line)
2693                removeLine(entry, line);
2694            if (prefix) {
2695                int prefixLen = strlen(prefix);
2696                if (!strncmp(initrd, prefix, prefixLen))
2697                    initrd += prefixLen;
2698            }
2699     endLine = getLineByType(LT_ENTRY_END, entry->lines);
2700     if (endLine)
2701        removeLine(entry, endLine);
2702            line = addLine(entry, cfg->cfi, LT_INITRD, kernelLine->indent, initrd);
2703            if (!line)
2704        return 1;
2705     if (endLine) {
2706        line = addLine(entry, cfg->cfi, LT_ENTRY_END, "", NULL);
2707                if (!line)
2708     return 1;
2709     }
2710    
2711            break;
2712        }
2713    
2714        return 0;
2715    }
2716    
2717  int checkDeviceBootloader(const char * device, const unsigned char * boot) {  int checkDeviceBootloader(const char * device, const unsigned char * boot) {
2718      int fd;      int fd;
2719      unsigned char bootSect[512];      unsigned char bootSect[512];
# Line 1809  int checkDeviceBootloader(const char * d Line 2737  int checkDeviceBootloader(const char * d
2737      if (memcmp(boot, bootSect, 3))      if (memcmp(boot, bootSect, 3))
2738   return 0;   return 0;
2739    
2740      if (boot[1] == 0xeb) {      if (boot[1] == JMP_SHORT_OPCODE) {
2741   offset = boot[2] + 2;   offset = boot[2] + 2;
2742      } else if (boot[1] == 0xe8 || boot[1] == 0xe9) {      } else if (boot[1] == 0xe8 || boot[1] == 0xe9) {
2743   offset = (boot[3] << 8) + boot[2] + 2;   offset = (boot[3] << 8) + boot[2] + 2;
2744      } else if (boot[0] == 0xeb) {      } else if (boot[0] == JMP_SHORT_OPCODE) {
2745   offset = boot[1] + 2;        offset = boot[1] + 2;
2746            /*
2747     * it looks like grub, when copying stage1 into the mbr, patches stage1
2748     * right after the JMP location, replacing other instructions such as
2749     * JMPs for NOOPs. So, relax the check a little bit by skipping those
2750     * different bytes.
2751     */
2752          if ((bootSect[offset + 1] == NOOP_OPCODE)
2753      && (bootSect[offset + 2] == NOOP_OPCODE)) {
2754     offset = offset + 3;
2755          }
2756      } else if (boot[0] == 0xe8 || boot[0] == 0xe9) {      } else if (boot[0] == 0xe8 || boot[0] == 0xe9) {
2757   offset = (boot[2] << 8) + boot[1] + 2;   offset = (boot[2] << 8) + boot[1] + 2;
2758      } else {      } else {
# Line 1956  int checkForLilo(struct grubConfig * con Line 2894  int checkForLilo(struct grubConfig * con
2894      return checkDeviceBootloader(line->elements[1].item, boot);      return checkDeviceBootloader(line->elements[1].item, boot);
2895  }  }
2896    
2897    int checkForGrub2(struct grubConfig * config) {
2898        if (!access("/etc/grub.d/", R_OK))
2899     return 2;
2900    
2901        return 1;
2902    }
2903    
2904  int checkForGrub(struct grubConfig * config) {  int checkForGrub(struct grubConfig * config) {
2905      int fd;      int fd;
2906      unsigned char bootSect[512];      unsigned char bootSect[512];
# Line 1976  int checkForGrub(struct grubConfig * con Line 2921  int checkForGrub(struct grubConfig * con
2921      if (read(fd, bootSect, 512) != 512) {      if (read(fd, bootSect, 512) != 512) {
2922   fprintf(stderr, _("grubby: unable to read %s: %s\n"),   fprintf(stderr, _("grubby: unable to read %s: %s\n"),
2923   "/boot/grub/stage1", strerror(errno));   "/boot/grub/stage1", strerror(errno));
2924     close(fd);
2925     return 1;
2926        }
2927        close(fd);
2928    
2929        return checkDeviceBootloader(boot, bootSect);
2930    }
2931    
2932    int checkForExtLinux(struct grubConfig * config) {
2933        int fd;
2934        unsigned char bootSect[512];
2935        char * boot;
2936        char executable[] = "/boot/extlinux/extlinux";
2937    
2938        printf("entered: checkForExtLinux()\n");
2939    
2940        if (parseSysconfigGrub(NULL, &boot))
2941     return 0;
2942    
2943        /* assume grub is not installed -- not an error condition */
2944        if (!boot)
2945     return 0;
2946    
2947        fd = open(executable, O_RDONLY);
2948        if (fd < 0)
2949     /* this doesn't exist if grub hasn't been installed */
2950     return 0;
2951    
2952        if (read(fd, bootSect, 512) != 512) {
2953     fprintf(stderr, _("grubby: unable to read %s: %s\n"),
2954     executable, strerror(errno));
2955   return 1;   return 1;
2956      }      }
2957      close(fd);      close(fd);
# Line 1994  static char * getRootSpecifier(char * st Line 2970  static char * getRootSpecifier(char * st
2970      return rootspec;      return rootspec;
2971  }  }
2972    
2973    static char * getInitrdVal(struct grubConfig * config,
2974       const char * prefix, struct singleLine *tmplLine,
2975       const char * newKernelInitrd,
2976       const char ** extraInitrds, int extraInitrdCount)
2977    {
2978        char *initrdVal, *end;
2979        int i;
2980        size_t totalSize;
2981        size_t prefixLen;
2982        char separatorChar;
2983    
2984        prefixLen = strlen(prefix);
2985        totalSize = strlen(newKernelInitrd) - prefixLen + 1 /* \0 */;
2986    
2987        for (i = 0; i < extraInitrdCount; i++) {
2988     totalSize += sizeof(separatorChar);
2989     totalSize += strlen(extraInitrds[i]) - prefixLen;
2990        }
2991    
2992        initrdVal = end = malloc(totalSize);
2993    
2994        end = stpcpy (end, newKernelInitrd + prefixLen);
2995    
2996        separatorChar = getKeywordByType(LT_INITRD, config->cfi)->separatorChar;
2997        for (i = 0; i < extraInitrdCount; i++) {
2998     const char *extraInitrd;
2999     int j;
3000    
3001     extraInitrd = extraInitrds[i] + prefixLen;
3002     /* Don't add entries that are already there */
3003     if (tmplLine != NULL) {
3004        for (j = 2; j < tmplLine->numElements; j++)
3005     if (strcmp(extraInitrd, tmplLine->elements[j].item) == 0)
3006        break;
3007    
3008        if (j != tmplLine->numElements)
3009     continue;
3010     }
3011    
3012     *end++ = separatorChar;
3013     end = stpcpy(end, extraInitrd);
3014        }
3015    
3016        return initrdVal;
3017    }
3018    
3019  int addNewKernel(struct grubConfig * config, struct singleEntry * template,  int addNewKernel(struct grubConfig * config, struct singleEntry * template,
3020           const char * prefix,           const char * prefix,
3021   char * newKernelPath, char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
3022   char * newKernelArgs, char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
3023                   char * newMBKernel, char * newMBKernelArgs) {   const char ** extraInitrds, int extraInitrdCount,
3024                     const char * newMBKernel, const char * newMBKernelArgs) {
3025      struct singleEntry * new;      struct singleEntry * new;
3026      struct singleLine * newLine = NULL, * tmplLine = NULL, * lastLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
3027      int needs;      int needs;
     char * indent = NULL;  
     char * rootspec = NULL;  
3028      char * chptr;      char * chptr;
     int i;  
     enum lineType_e type;  
3029    
3030      if (!newKernelPath) return 0;      if (!newKernelPath) return 0;
3031    
# Line 2036  int addNewKernel(struct grubConfig * con Line 3055  int addNewKernel(struct grubConfig * con
3055      config->entries = new;      config->entries = new;
3056    
3057      /* copy/update from the template */      /* copy/update from the template */
3058      needs = KERNEL_KERNEL | KERNEL_INITRD | KERNEL_TITLE;      needs = NEED_KERNEL | NEED_TITLE;
3059        if (newKernelInitrd)
3060     needs |= NEED_INITRD;
3061      if (newMBKernel) {      if (newMBKernel) {
3062          needs |= KERNEL_MB;          needs |= NEED_MB;
3063          new->multiboot = 1;          new->multiboot = 1;
3064      }      }
3065    
3066      if (template) {      if (template) {
3067   for (tmplLine = template->lines; tmplLine; tmplLine = tmplLine->next) {   for (masterLine = template->lines;
3068      /* remember the indention level; we may need it for new lines */       masterLine && (tmplLine = lineDup(masterLine));
3069      if (tmplLine->numElements)       lineFree(tmplLine), masterLine = masterLine->next)
3070   indent = tmplLine->indent;   {
3071        dbgPrintf("addNewKernel processing %d\n", tmplLine->type);
3072    
3073      /* skip comments */      /* skip comments */
3074      chptr = tmplLine->indent;      chptr = tmplLine->indent;
3075      while (*chptr && isspace(*chptr)) chptr++;      while (*chptr && isspace(*chptr)) chptr++;
3076      if (*chptr == '#') continue;      if (*chptr == '#') continue;
3077    
3078      /* we don't need an initrd here */      if (tmplLine->type == LT_KERNEL &&
3079      if (tmplLine->type == LT_INITRD && !newKernelInitrd) continue;      tmplLine->numElements >= 2) {
3080     if (!template->multiboot && (needs & NEED_MB)) {
3081              if (tmplLine->type == LT_KERNEL &&      /* it's not a multiboot template and this is the kernel
3082                  !template->multiboot && (needs & KERNEL_MB)) {       * line.  Try to be intelligent about inserting the
3083                  struct singleLine *l;       * hypervisor at the same time.
3084                  needs &= ~ KERNEL_MB;       */
3085        if (config->cfi->mbHyperFirst) {
3086                  l = addLine(new, config->cfi, LT_KERNEL,   /* insert the hypervisor first */
3087                                    config->secondaryIndent,   newLine = addLine(new, config->cfi, LT_HYPER,
3088                                    newMBKernel + strlen(prefix));    tmplLine->indent,
3089                      newMBKernel + strlen(prefix));
3090                  tmplLine = lastLine;   /* set up for adding the kernel line */
3091                  if (!new->lines) {   free(tmplLine->indent);
3092                      new->lines = l;   tmplLine->indent = strdup(config->secondaryIndent);
3093                  } else {   needs &= ~NEED_MB;
3094                      newLine->next = l;      }
3095                      newLine = l;      if (needs & NEED_KERNEL) {
3096                  }   /* use addLineTmpl to preserve line elements,
3097                  continue;   * otherwise we could just call addLine.  Unfortunately
3098              } else if (tmplLine->type == LT_KERNEL &&   * this means making some changes to the template
3099                         template->multiboot && !new->multiboot) {   * such as the indent change above and the type
3100                  continue; /* don't need multiboot kernel here */   * change below.
3101              }   */
3102     struct keywordTypes * mbm_kw =
3103        getKeywordByType(LT_MBMODULE, config->cfi);
3104     if (mbm_kw) {
3105        tmplLine->type = LT_MBMODULE;
3106        free(tmplLine->elements[0].item);
3107        tmplLine->elements[0].item = strdup(mbm_kw->key);
3108     }
3109     newLine = addLineTmpl(new, tmplLine, newLine,
3110          newKernelPath + strlen(prefix), config->cfi);
3111     needs &= ~NEED_KERNEL;
3112        }
3113        if (needs & NEED_MB) { /* !mbHyperFirst */
3114     newLine = addLine(new, config->cfi, LT_HYPER,
3115      config->secondaryIndent,
3116      newMBKernel + strlen(prefix));
3117     needs &= ~NEED_MB;
3118        }
3119     } else if (needs & NEED_KERNEL) {
3120        newLine = addLineTmpl(new, tmplLine, newLine,
3121      newKernelPath + strlen(prefix), config->cfi);
3122        needs &= ~NEED_KERNEL;
3123     }
3124    
3125      if (!new->lines) {      } else if (tmplLine->type == LT_HYPER &&
3126   newLine = malloc(sizeof(*newLine));         tmplLine->numElements >= 2) {
3127   new->lines = newLine;   if (needs & NEED_MB) {
3128      } else {      newLine = addLineTmpl(new, tmplLine, newLine,
3129   newLine->next = malloc(sizeof(*newLine));    newMBKernel + strlen(prefix), config->cfi);
3130   newLine = newLine->next;      needs &= ~NEED_MB;
3131      }   }
3132    
3133        } else if (tmplLine->type == LT_MBMODULE &&
3134           tmplLine->numElements >= 2) {
3135     if (new->multiboot) {
3136        if (needs & NEED_KERNEL) {
3137     newLine = addLineTmpl(new, tmplLine, newLine,
3138          newKernelPath +
3139          strlen(prefix), config->cfi);
3140     needs &= ~NEED_KERNEL;
3141        } else if (config->cfi->mbInitRdIsModule &&
3142           (needs & NEED_INITRD)) {
3143     char *initrdVal;
3144     initrdVal = getInitrdVal(config, prefix, tmplLine,
3145     newKernelInitrd, extraInitrds,
3146     extraInitrdCount);
3147     newLine = addLineTmpl(new, tmplLine, newLine,
3148          initrdVal, config->cfi);
3149     free(initrdVal);
3150     needs &= ~NEED_INITRD;
3151        }
3152     } else if (needs & NEED_KERNEL) {
3153        /* template is multi but new is not,
3154         * insert the kernel in the first module slot
3155         */
3156        tmplLine->type = LT_KERNEL;
3157        free(tmplLine->elements[0].item);
3158        tmplLine->elements[0].item =
3159     strdup(getKeywordByType(LT_KERNEL, config->cfi)->key);
3160        newLine = addLineTmpl(new, tmplLine, newLine,
3161      newKernelPath + strlen(prefix), config->cfi);
3162        needs &= ~NEED_KERNEL;
3163     } else if (needs & NEED_INITRD) {
3164        char *initrdVal;
3165        /* template is multi but new is not,
3166         * insert the initrd in the second module slot
3167         */
3168        tmplLine->type = LT_INITRD;
3169        free(tmplLine->elements[0].item);
3170        tmplLine->elements[0].item =
3171     strdup(getKeywordByType(LT_INITRD, config->cfi)->key);
3172        initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);
3173        newLine = addLineTmpl(new, tmplLine, newLine, initrdVal, config->cfi);
3174        free(initrdVal);
3175        needs &= ~NEED_INITRD;
3176     }
3177    
     newLine->indent = strdup(tmplLine->indent);  
     newLine->next = NULL;  
     newLine->type = tmplLine->type;  
     newLine->numElements = tmplLine->numElements;  
     newLine->elements = malloc(sizeof(*newLine->elements) *  
     newLine->numElements);  
     for (i = 0; i < newLine->numElements; i++) {  
  newLine->elements[i].item = strdup(tmplLine->elements[i].item);  
  newLine->elements[i].indent =  
  strdup(tmplLine->elements[i].indent);  
     }  
   
             lastLine = tmplLine;  
     if (tmplLine->type == LT_KERNEL && tmplLine->numElements >= 2) {  
                 char * repl;  
                 if (!template->multiboot) {  
                     needs &= ~KERNEL_KERNEL;  
                     repl = newKernelPath;  
                 } else {  
                     needs &= ~KERNEL_MB;  
                     repl = newMBKernel;  
                 }  
                 if (new->multiboot && !template->multiboot) {  
                     free(newLine->elements[0].item);  
                     newLine->elements[0].item = strdup("module");  
                     newLine->type = LT_MBMODULE;  
                 }  
  free(newLine->elements[1].item);  
                 rootspec = getRootSpecifier(tmplLine->elements[1].item);  
                 if (rootspec != NULL) {  
                     newLine->elements[1].item = sdupprintf("%s%s",  
                                                            rootspec,  
                                                            repl +  
                                                            strlen(prefix));  
                 } else {  
                     newLine->elements[1].item = strdup(repl +  
                                                        strlen(prefix));  
                 }  
             } else if (tmplLine->type == LT_MBMODULE &&  
                        tmplLine->numElements >= 2 && (needs & KERNEL_KERNEL)) {  
                 needs &= ~KERNEL_KERNEL;  
                 if (!new->multiboot && template->multiboot) {  
                     free(newLine->elements[0].item);  
                     newLine->elements[0].item = strdup("kernel");  
                     newLine->type = LT_KERNEL;  
                 }  
  free(newLine->elements[1].item);  
                 rootspec = getRootSpecifier(tmplLine->elements[1].item);  
                 if (rootspec != NULL) {  
                     newLine->elements[1].item = sdupprintf("%s%s",  
                                                            rootspec,  
                                                            newKernelPath +  
                                                            strlen(prefix));  
                 } else {  
                     newLine->elements[1].item = strdup(newKernelPath +  
                                                        strlen(prefix));  
                 }  
3178      } else if (tmplLine->type == LT_INITRD &&      } else if (tmplLine->type == LT_INITRD &&
3179      tmplLine->numElements >= 2) {         tmplLine->numElements >= 2) {
3180   needs &= ~KERNEL_INITRD;   if (needs & NEED_INITRD &&
3181   free(newLine->elements[1].item);      new->multiboot && !template->multiboot &&
3182                  if (new->multiboot && !template->multiboot) {      config->cfi->mbInitRdIsModule) {
3183                      free(newLine->elements[0].item);      /* make sure we don't insert the module initrd
3184                      newLine->elements[0].item = strdup("module");       * before the module kernel... if we don't do it here,
3185                      newLine->type = LT_MBMODULE;       * it will be inserted following the template.
3186                  }       */
3187                  rootspec = getRootSpecifier(tmplLine->elements[1].item);      if (!needs & NEED_KERNEL) {
3188                  if (rootspec != NULL) {   char *initrdVal;
3189                      newLine->elements[1].item = sdupprintf("%s%s",  
3190                                                             rootspec,   initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);
3191                                                             newKernelInitrd +   newLine = addLine(new, config->cfi, LT_MBMODULE,
3192                                                             strlen(prefix));    config->secondaryIndent,
3193                  } else {    initrdVal);
3194                      newLine->elements[1].item = strdup(newKernelInitrd +   free(initrdVal);
3195                                                         strlen(prefix));   needs &= ~NEED_INITRD;
3196                  }      }
3197              } else if (tmplLine->type == LT_MBMODULE &&   } else if (needs & NEED_INITRD) {
3198                         tmplLine->numElements >= 2 && (needs & KERNEL_INITRD)) {      char *initrdVal;
3199   needs &= ~KERNEL_INITRD;      initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);
3200                  if (!new->multiboot && template->multiboot) {      newLine = addLineTmpl(new, tmplLine, newLine, initrdVal, config->cfi);
3201                      free(newLine->elements[0].item);      free(initrdVal);
3202                      newLine->elements[0].item = strdup("initrd");      needs &= ~NEED_INITRD;
                     newLine->type = LT_INITRD;  
                 }  
  free(newLine->elements[1].item);  
                 rootspec = getRootSpecifier(tmplLine->elements[1].item);  
                 if (rootspec != NULL) {  
                     newLine->elements[1].item = sdupprintf("%s%s",  
                                                            rootspec,  
                                                            newKernelInitrd +  
                                                            strlen(prefix));  
                 } else {  
                     newLine->elements[1].item = strdup(newKernelInitrd +  
                                                        strlen(prefix));  
                 }  
     } else if (tmplLine->type == LT_TITLE &&  
     tmplLine->numElements >= 2) {  
  needs &= ~KERNEL_TITLE;  
   
  for (i = 1; i < newLine->numElements; i++) {  
     free(newLine->elements[i].item);  
     free(newLine->elements[i].indent);  
3203   }   }
3204    
3205   newLine->elements[1].item = strdup(newKernelTitle);      } else if (tmplLine->type == LT_MENUENTRY &&
3206   newLine->elements[1].indent = strdup("");         (needs & NEED_TITLE)) {
3207   newLine->numElements = 2;   requote(tmplLine, config->cfi);
3208     char *nkt = malloc(strlen(newKernelTitle)+3);
3209     strcpy(nkt, "'");
3210     strcat(nkt, newKernelTitle);
3211     strcat(nkt, "'");
3212     newLine = addLineTmpl(new, tmplLine, newLine, nkt, config->cfi);
3213     free(nkt);
3214     needs &= ~NEED_TITLE;
3215      } else if (tmplLine->type == LT_TITLE &&      } else if (tmplLine->type == LT_TITLE &&
3216                         config->cfi->titleBracketed &&         (needs & NEED_TITLE)) {
3217                         tmplLine->numElements == 1) {   if (tmplLine->numElements >= 2) {
3218                  needs &= ~KERNEL_TITLE;      newLine = addLineTmpl(new, tmplLine, newLine,
3219                  free(newLine->elements[0].item);    newKernelTitle, config->cfi);
3220                  free(newLine->elements[0].indent);      needs &= ~NEED_TITLE;
3221                  newLine->elements = malloc(sizeof(*newLine->elements) *   } else if (tmplLine->numElements == 1 &&
3222                                             newLine->numElements);     config->cfi->titleBracketed) {
3223        /* addLineTmpl doesn't handle titleBracketed */
3224                  newLine->elements[0].item = malloc(strlen(newKernelTitle) + 3);      newLine = addLine(new, config->cfi, LT_TITLE,
3225                  sprintf(newLine->elements[0].item, "[%s]", newKernelTitle);        tmplLine->indent, newKernelTitle);
3226                  newLine->elements[0].indent = strdup("");      needs &= ~NEED_TITLE;
3227                  newLine->numElements = 1;   }
3228              }      } else if (tmplLine->type == LT_ECHO) {
3229        requote(tmplLine, config->cfi);
3230        static const char *prefix = "'Loading ";
3231        if (tmplLine->numElements > 1 &&
3232        strstr(tmplLine->elements[1].item, prefix) &&
3233        masterLine->next && masterLine->next->type == LT_KERNEL) {
3234     char *newTitle = malloc(strlen(prefix) +
3235     strlen(newKernelTitle) + 2);
3236    
3237     strcpy(newTitle, prefix);
3238     strcat(newTitle, newKernelTitle);
3239     strcat(newTitle, "'");
3240     newLine = addLine(new, config->cfi, LT_ECHO,
3241     tmplLine->indent, newTitle);
3242     free(newTitle);
3243        } else {
3244     /* pass through other lines from the template */
3245     newLine = addLineTmpl(new, tmplLine, newLine, NULL,
3246     config->cfi);
3247        }
3248        } else {
3249     /* pass through other lines from the template */
3250     newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
3251        }
3252   }   }
3253    
3254      } else {      } else {
3255   for (i = 0; config->cfi->keywords[i].key; i++) {   /* don't have a template, so start the entry with the
3256      if ((config->cfi->keywords[i].type == config->cfi->entrySeparator) || (config->cfi->keywords[i].type == LT_OTHER))   * appropriate starting line
3257     */
3258     switch (config->cfi->entryStart) {
3259        case LT_KERNEL:
3260     if (new->multiboot && config->cfi->mbHyperFirst) {
3261        /* fall through to LT_HYPER */
3262     } else {
3263        newLine = addLine(new, config->cfi, LT_KERNEL,
3264          config->primaryIndent,
3265          newKernelPath + strlen(prefix));
3266        needs &= ~NEED_KERNEL;
3267        break;
3268     }
3269    
3270        case LT_HYPER:
3271     newLine = addLine(new, config->cfi, LT_HYPER,
3272      config->primaryIndent,
3273      newMBKernel + strlen(prefix));
3274     needs &= ~NEED_MB;
3275   break;   break;
         }  
3276    
3277   switch (config->cfi->keywords[i].type) {      case LT_MENUENTRY: {
3278      case LT_KERNEL:  needs &= ~KERNEL_KERNEL,   char *nkt = malloc(strlen(newKernelTitle)+3);
3279       chptr = newKernelPath + strlen(prefix);   strcpy(nkt, "'");
3280       type = LT_KERNEL; break;   strcat(nkt, newKernelTitle);
3281      case LT_TITLE:   needs &= ~KERNEL_TITLE, chptr = newKernelTitle;   strcat(nkt, "'");
3282       type = LT_TITLE; break;          newLine = addLine(new, config->cfi, LT_MENUENTRY,
3283      default:        config->primaryIndent, nkt);
3284                  /* zipl strikes again */   free(nkt);
3285                  if (config->cfi->titleBracketed) {   needs &= ~NEED_TITLE;
3286                      needs &= ~KERNEL_TITLE;   needs |= NEED_END;
3287                      chptr = newKernelTitle;   break;
3288                      type = LT_TITLE;      }
3289                      break;      case LT_TITLE:
3290                  } else {   if( useextlinuxmenu != 0 ){ // We just need useextlinuxmenu to not be zero (set above)
3291                      abort();   char * templabel;
3292                  }   int x = 0, y = 0;
3293   }  
3294     templabel = strdup(newKernelTitle);
3295     while( templabel[x]){
3296     if( templabel[x] == ' ' ){
3297     y = x;
3298     while( templabel[y] ){
3299     templabel[y] = templabel[y+1];
3300     y++;
3301     }
3302     }
3303     x++;
3304     }
3305     newLine = addLine(new, config->cfi, LT_TITLE,
3306      config->primaryIndent, templabel);
3307     free(templabel);
3308     }else{
3309     newLine = addLine(new, config->cfi, LT_TITLE,
3310      config->primaryIndent, newKernelTitle);
3311     }
3312     needs &= ~NEED_TITLE;
3313     break;
3314    
3315   newLine = addLine(new, config->cfi, type, config->primaryIndent, chptr);      default:
3316   new->lines = newLine;   abort();
3317     }
3318      }      }
3319    
3320      if (new->multiboot) {      /* add the remainder of the lines, i.e. those that either
3321          if (needs & KERNEL_MB)       * weren't present in the template, or in the case of no template,
3322              newLine = addLine(new, config->cfi, LT_KERNEL,       * all the lines following the entryStart.
3323                                config->secondaryIndent,       */
3324                                newMBKernel + strlen(prefix));      if (needs & NEED_TITLE) {
3325          if (needs & KERNEL_KERNEL)   newLine = addLine(new, config->cfi, LT_TITLE,
3326              newLine = addLine(new, config->cfi, LT_MBMODULE,    config->secondaryIndent,
3327                                config->secondaryIndent,    newKernelTitle);
3328                                newKernelPath + strlen(prefix));   needs &= ~NEED_TITLE;
3329          /* don't need to check for title as it's guaranteed to have been      }
3330           * done as we only do multiboot with grub which uses title as      if ((needs & NEED_MB) && config->cfi->mbHyperFirst) {
3331           * a separator */   newLine = addLine(new, config->cfi, LT_HYPER,
3332          if (needs & KERNEL_INITRD && newKernelInitrd)    config->secondaryIndent,
3333              newLine = addLine(new, config->cfi, LT_MBMODULE,    newMBKernel + strlen(prefix));
3334                                config->secondaryIndent,   needs &= ~NEED_MB;
3335                                newKernelInitrd + strlen(prefix));      }
3336      } else {      if (needs & NEED_KERNEL) {
3337          if (needs & KERNEL_KERNEL)   newLine = addLine(new, config->cfi,
3338              newLine = addLine(new, config->cfi, LT_KERNEL,    (new->multiboot && getKeywordByType(LT_MBMODULE,
3339                                config->secondaryIndent,        config->cfi)) ?
3340                                newKernelPath + strlen(prefix));    LT_MBMODULE : LT_KERNEL,
3341          if (needs & KERNEL_TITLE)    config->secondaryIndent,
3342              newLine = addLine(new, config->cfi, LT_TITLE,    newKernelPath + strlen(prefix));
3343                                config->secondaryIndent,   needs &= ~NEED_KERNEL;
3344                                newKernelTitle);      }
3345          if (needs & KERNEL_INITRD && newKernelInitrd)      if (needs & NEED_MB) {
3346              newLine = addLine(new, config->cfi, LT_INITRD,   newLine = addLine(new, config->cfi, LT_HYPER,
3347                                config->secondaryIndent,    config->secondaryIndent,
3348                                newKernelInitrd + strlen(prefix));    newMBKernel + strlen(prefix));
3349     needs &= ~NEED_MB;
3350        }
3351        if (needs & NEED_INITRD) {
3352     char *initrdVal;
3353     initrdVal = getInitrdVal(config, prefix, NULL, newKernelInitrd, extraInitrds, extraInitrdCount);
3354     newLine = addLine(new, config->cfi,
3355      (new->multiboot && getKeywordByType(LT_MBMODULE,
3356          config->cfi)) ?
3357      LT_MBMODULE : LT_INITRD,
3358      config->secondaryIndent,
3359      initrdVal);
3360     free(initrdVal);
3361     needs &= ~NEED_INITRD;
3362        }
3363        if (needs & NEED_END) {
3364     newLine = addLine(new, config->cfi, LT_ENTRY_END,
3365     config->secondaryIndent, NULL);
3366     needs &= ~NEED_END;
3367        }
3368    
3369        if (needs) {
3370     printf(_("grubby: needs=%d, aborting\n"), needs);
3371     abort();
3372      }      }
3373    
3374      if (updateImage(config, "0", prefix, newKernelArgs, NULL,      if (updateImage(config, "0", prefix, newKernelArgs, NULL,
# Line 2274  int addNewKernel(struct grubConfig * con Line 3377  int addNewKernel(struct grubConfig * con
3377      return 0;      return 0;
3378  }  }
3379    
3380    static void traceback(int signum)
3381    {
3382        void *array[40];
3383        size_t size;
3384    
3385        signal(SIGSEGV, SIG_DFL);
3386        memset(array, '\0', sizeof (array));
3387        size = backtrace(array, 40);
3388    
3389        fprintf(stderr, "grubby recieved SIGSEGV!  Backtrace (%ld):\n",
3390                (unsigned long)size);
3391        backtrace_symbols_fd(array, size, STDERR_FILENO);
3392        exit(1);
3393    }
3394    
3395  int main(int argc, const char ** argv) {  int main(int argc, const char ** argv) {
3396      poptContext optCon;      poptContext optCon;
3397      char * grubConfig = NULL;      const char * grubConfig = NULL;
3398      char * outputFile = NULL;      char * outputFile = NULL;
3399      int arg = 0;      int arg = 0;
3400      int flags = 0;      int flags = 0;
3401      int badImageOkay = 0;      int badImageOkay = 0;
3402        int configureGrub2 = 0;
3403      int configureLilo = 0, configureELilo = 0, configureGrub = 0;      int configureLilo = 0, configureELilo = 0, configureGrub = 0;
3404      int configureYaboot = 0, configureSilo = 0, configureZipl = 0;      int configureYaboot = 0, configureSilo = 0, configureZipl = 0;
3405        int configureExtLinux = 0;
3406      int bootloaderProbe = 0;      int bootloaderProbe = 0;
3407        int extraInitrdCount = 0;
3408      char * updateKernelPath = NULL;      char * updateKernelPath = NULL;
3409      char * newKernelPath = NULL;      char * newKernelPath = NULL;
3410      char * removeKernelPath = NULL;      char * removeKernelPath = NULL;
# Line 2299  int main(int argc, const char ** argv) { Line 3420  int main(int argc, const char ** argv) {
3420      char * defaultKernel = NULL;      char * defaultKernel = NULL;
3421      char * removeArgs = NULL;      char * removeArgs = NULL;
3422      char * kernelInfo = NULL;      char * kernelInfo = NULL;
3423        char * extraInitrds[MAX_EXTRA_INITRDS] = { NULL };
3424      const char * chptr = NULL;      const char * chptr = NULL;
3425      struct configFileInfo * cfi = NULL;      struct configFileInfo * cfi = NULL;
3426      struct grubConfig * config;      struct grubConfig * config;
3427      struct singleEntry * template = NULL;      struct singleEntry * template = NULL;
3428      int copyDefault = 0, makeDefault = 0;      int copyDefault = 0, makeDefault = 0;
3429      int displayDefault = 0;      int displayDefault = 0;
3430        int displayDefaultIndex = 0;
3431        int displayDefaultTitle = 0;
3432      struct poptOption options[] = {      struct poptOption options[] = {
3433   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,
3434      _("add an entry for the specified kernel"), _("kernel-path") },      _("add an entry for the specified kernel"), _("kernel-path") },
# Line 2335  int main(int argc, const char ** argv) { Line 3459  int main(int argc, const char ** argv) {
3459        "the kernel referenced by the default image does not exist, "        "the kernel referenced by the default image does not exist, "
3460        "the first linux entry whose kernel does exist is used as the "        "the first linux entry whose kernel does exist is used as the "
3461        "template"), NULL },        "template"), NULL },
3462     { "debug", 0, 0, &debug, 0,
3463        _("print debugging information for failures") },
3464   { "default-kernel", 0, 0, &displayDefault, 0,   { "default-kernel", 0, 0, &displayDefault, 0,
3465      _("display the path of the default kernel") },      _("display the path of the default kernel") },
3466     { "default-index", 0, 0, &displayDefaultIndex, 0,
3467        _("display the index of the default kernel") },
3468     { "default-title", 0, 0, &displayDefaultTitle, 0,
3469        _("display the title of the default kernel") },
3470   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
3471      _("configure elilo bootloader") },      _("configure elilo bootloader") },
3472     { "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,
3473        _("configure extlinux bootloader (from syslinux)") },
3474   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,
3475      _("configure grub bootloader") },      _("configure grub bootloader") },
3476     { "grub2", 0, POPT_ARG_NONE, &configureGrub2, 0,
3477        _("configure grub2 bootloader") },
3478   { "info", 0, POPT_ARG_STRING, &kernelInfo, 0,   { "info", 0, POPT_ARG_STRING, &kernelInfo, 0,
3479      _("display boot information for specified kernel"),      _("display boot information for specified kernel"),
3480      _("kernel-path") },      _("kernel-path") },
3481   { "initrd", 0, POPT_ARG_STRING, &newKernelInitrd, 0,   { "initrd", 0, POPT_ARG_STRING, &newKernelInitrd, 0,
3482      _("initrd image for the new kernel"), _("initrd-path") },      _("initrd image for the new kernel"), _("initrd-path") },
3483     { "extra-initrd", 'i', POPT_ARG_STRING, NULL, 'i',
3484        _("auxilliary initrd image for things other than the new kernel"), _("initrd-path") },
3485   { "lilo", 0, POPT_ARG_NONE, &configureLilo, 0,   { "lilo", 0, POPT_ARG_NONE, &configureLilo, 0,
3486      _("configure lilo bootloader") },      _("configure lilo bootloader") },
3487   { "make-default", 0, 0, &makeDefault, 0,   { "make-default", 0, 0, &makeDefault, 0,
# Line 2382  int main(int argc, const char ** argv) { Line 3518  int main(int argc, const char ** argv) {
3518   { 0, 0, 0, 0, 0 }   { 0, 0, 0, 0, 0 }
3519      };      };
3520    
3521        useextlinuxmenu=0;
3522    
3523        signal(SIGSEGV, traceback);
3524    
3525      optCon = poptGetContext("grubby", argc, argv, options, 0);      optCon = poptGetContext("grubby", argc, argv, options, 0);
3526      poptReadDefaultConfig(optCon, 1);      poptReadDefaultConfig(optCon, 1);
3527    
# Line 2391  int main(int argc, const char ** argv) { Line 3531  int main(int argc, const char ** argv) {
3531      printf("grubby version %s\n", VERSION);      printf("grubby version %s\n", VERSION);
3532      exit(0);      exit(0);
3533      break;      break;
3534      case 'i':
3535        if (extraInitrdCount < MAX_EXTRA_INITRDS) {
3536         extraInitrds[extraInitrdCount++] = strdup(poptGetOptArg(optCon));
3537        } else {
3538     fprintf(stderr, _("grubby: extra initrd maximum is %d\n"), extraInitrdCount);
3539     return 1;
3540        }
3541        break;
3542   }   }
3543      }      }
3544    
# Line 2406  int main(int argc, const char ** argv) { Line 3554  int main(int argc, const char ** argv) {
3554   return 1;   return 1;
3555      }      }
3556    
3557      if ((configureLilo + configureGrub + configureELilo +      if ((configureLilo + configureGrub2 + configureGrub + configureELilo +
3558   configureYaboot + configureSilo + configureZipl) > 1) {   configureYaboot + configureSilo + configureZipl +
3559     configureExtLinux ) > 1) {
3560   fprintf(stderr, _("grubby: cannot specify multiple bootloaders\n"));   fprintf(stderr, _("grubby: cannot specify multiple bootloaders\n"));
3561   return 1;   return 1;
3562      } else if (bootloaderProbe && grubConfig) {      } else if (bootloaderProbe && grubConfig) {
3563   fprintf(stderr,   fprintf(stderr,
3564      _("grubby: cannot specify config file with --bootloader-probe\n"));      _("grubby: cannot specify config file with --bootloader-probe\n"));
3565   return 1;   return 1;
3566        } else if (configureGrub2) {
3567     cfi = &grub2ConfigType;
3568      } else if (configureLilo) {      } else if (configureLilo) {
3569   cfi = &liloConfigType;   cfi = &liloConfigType;
3570      } else if (configureGrub) {      } else if (configureGrub) {
# Line 2426  int main(int argc, const char ** argv) { Line 3577  int main(int argc, const char ** argv) {
3577          cfi = &siloConfigType;          cfi = &siloConfigType;
3578      } else if (configureZipl) {      } else if (configureZipl) {
3579          cfi = &ziplConfigType;          cfi = &ziplConfigType;
3580        } else if (configureExtLinux) {
3581     cfi = &extlinuxConfigType;
3582     useextlinuxmenu=1;
3583      }      }
3584    
3585      if (!cfi) {      if (!cfi) {
3586            if (grub2FindConfig(&grub2ConfigType))
3587        cfi = &grub2ConfigType;
3588     else
3589        #ifdef __ia64__        #ifdef __ia64__
3590   cfi = &eliloConfigType;      cfi = &eliloConfigType;
3591        #elif __powerpc__        #elif __powerpc__
3592   cfi = &yabootConfigType;      cfi = &yabootConfigType;
3593        #elif __sparc__        #elif __sparc__
3594          cfi = &siloConfigType;              cfi = &siloConfigType;
3595        #elif __s390__        #elif __s390__
3596          cfi = &ziplConfigType;              cfi = &ziplConfigType;
3597        #elif __s390x__        #elif __s390x__
3598          cfi = &ziplConfigtype;              cfi = &ziplConfigtype;
3599        #else        #else
3600   cfi = &grubConfigType;      cfi = &grubConfigType;
3601        #endif        #endif
3602      }      }
3603    
3604      if (!grubConfig)      if (!grubConfig) {
3605   grubConfig = cfi->defaultConfig;   if (cfi->findConfig)
3606        grubConfig = cfi->findConfig(cfi);
3607     if (!grubConfig)
3608        grubConfig = cfi->defaultConfig;
3609        }
3610    
3611      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||
3612    newKernelPath || removeKernelPath || makeDefault ||    newKernelPath || removeKernelPath || makeDefault ||
3613    defaultKernel)) {    defaultKernel || displayDefaultIndex || displayDefaultTitle)) {
3614   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
3615    "specified option"));    "specified option"));
3616   return 1;   return 1;
# Line 2465  int main(int argc, const char ** argv) { Line 3626  int main(int argc, const char ** argv) {
3626      if (newKernelPath && !newKernelTitle) {      if (newKernelPath && !newKernelTitle) {
3627   fprintf(stderr, _("grubby: kernel title must be specified\n"));   fprintf(stderr, _("grubby: kernel title must be specified\n"));
3628   return 1;   return 1;
3629      } else if (!newKernelPath && (newKernelTitle  || newKernelInitrd ||      } else if (!newKernelPath && (newKernelTitle  || copyDefault ||
3630    newKernelInitrd || copyDefault     ||    (newKernelInitrd && !updateKernelPath)||
3631    makeDefault)) {    makeDefault || extraInitrdCount > 0)) {
3632   fprintf(stderr, _("grubby: kernel path expected\n"));   fprintf(stderr, _("grubby: kernel path expected\n"));
3633   return 1;   return 1;
3634      }      }
# Line 2492  int main(int argc, const char ** argv) { Line 3653  int main(int argc, const char ** argv) {
3653   defaultKernel = NULL;   defaultKernel = NULL;
3654      }      }
3655    
3656      if (!strcmp(grubConfig, "-") && !outputFile) {      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {
3657   fprintf(stderr, _("grubby: output file must be specified if stdin "   fprintf(stderr, _("grubby: output file must be specified if stdin "
3658   "is used\n"));   "is used\n"));
3659   return 1;   return 1;
# Line 2500  int main(int argc, const char ** argv) { Line 3661  int main(int argc, const char ** argv) {
3661    
3662      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
3663   && !kernelInfo && !bootloaderProbe && !updateKernelPath   && !kernelInfo && !bootloaderProbe && !updateKernelPath
3664          && !removeMBKernel) {          && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle) {
3665   fprintf(stderr, _("grubby: no action specified\n"));   fprintf(stderr, _("grubby: no action specified\n"));
3666   return 1;   return 1;
3667      }      }
# Line 2520  int main(int argc, const char ** argv) { Line 3681  int main(int argc, const char ** argv) {
3681   bootPrefix = "";   bootPrefix = "";
3682      }      }
3683    
3684        if (!cfi->mbAllowExtraInitRds &&
3685     extraInitrdCount > 0) {
3686     fprintf(stderr, _("grubby: %s doesn't allow multiple initrds\n"), cfi->defaultConfig);
3687     return 1;
3688        }
3689    
3690      if (bootloaderProbe) {      if (bootloaderProbe) {
3691   int lrc = 0, grc = 0;   int lrc = 0, grc = 0, gr2c = 0, erc = 0;
3692   struct grubConfig * lconfig, * gconfig;   struct grubConfig * lconfig, * gconfig;
3693    
3694   if (!access(grubConfigType.defaultConfig, F_OK)) {   const char *grub2config = grub2FindConfig(&grub2ConfigType);
3695      gconfig = readConfig(grubConfigType.defaultConfig, &grubConfigType);   if (grub2config) {
3696        gconfig = readConfig(grub2config, &grub2ConfigType);
3697        if (!gconfig)
3698     gr2c = 1;
3699        else
3700     gr2c = checkForGrub2(gconfig);
3701     }
3702    
3703     const char *grubconfig = grubFindConfig(&grubConfigType);
3704     if (!access(grubconfig, F_OK)) {
3705        gconfig = readConfig(grubconfig, &grubConfigType);
3706      if (!gconfig)      if (!gconfig)
3707   grc = 1;   grc = 1;
3708      else      else
# Line 2540  int main(int argc, const char ** argv) { Line 3717  int main(int argc, const char ** argv) {
3717   lrc = checkForLilo(lconfig);   lrc = checkForLilo(lconfig);
3718   }   }
3719    
3720   if (lrc == 1 || grc == 1) return 1;   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {
3721        lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);
3722        if (!lconfig)
3723     erc = 1;
3724        else
3725     erc = checkForExtLinux(lconfig);
3726     }
3727    
3728     if (lrc == 1 || grc == 1 || gr2c == 1) return 1;
3729    
3730   if (lrc == 2) printf("lilo\n");   if (lrc == 2) printf("lilo\n");
3731     if (gr2c == 2) printf("grub2\n");
3732   if (grc == 2) printf("grub\n");   if (grc == 2) printf("grub\n");
3733     if (erc == 2) printf("extlinux\n");
3734    
3735   return 0;   return 0;
3736      }      }
# Line 2561  int main(int argc, const char ** argv) { Line 3748  int main(int argc, const char ** argv) {
3748   if (!entry) return 0;   if (!entry) return 0;
3749   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
3750    
3751   line = entry->lines;   line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);
  while (line && line->type != LT_KERNEL) line = line->next;  
3752   if (!line) return 0;   if (!line) return 0;
3753    
3754          rootspec = getRootSpecifier(line->elements[1].item);          rootspec = getRootSpecifier(line->elements[1].item);
# Line 2570  int main(int argc, const char ** argv) { Line 3756  int main(int argc, const char ** argv) {
3756                 ((rootspec != NULL) ? strlen(rootspec) : 0));                 ((rootspec != NULL) ? strlen(rootspec) : 0));
3757    
3758   return 0;   return 0;
3759    
3760        } else if (displayDefaultTitle) {
3761     struct singleLine * line;
3762     struct singleEntry * entry;
3763    
3764     if (config->defaultImage == -1) return 0;
3765     entry = findEntryByIndex(config, config->defaultImage);
3766     if (!entry) return 0;
3767    
3768     if (!configureGrub2) {
3769      line = getLineByType(LT_TITLE, entry->lines);
3770      if (!line) return 0;
3771      printf("%s\n", line->elements[1].item);
3772    
3773     } else {
3774      char * title;
3775    
3776      dbgPrintf("This is GRUB2, default title is embeded in menuentry\n");
3777      line = getLineByType(LT_MENUENTRY, entry->lines);
3778      if (!line) return 0;
3779      title = grub2ExtractTitle(line);
3780      if (title)
3781        printf("%s\n", title);
3782     }
3783     return 0;
3784    
3785        } else if (displayDefaultIndex) {
3786            if (config->defaultImage == -1) return 0;
3787            printf("%i\n", config->defaultImage);
3788    
3789      } else if (kernelInfo)      } else if (kernelInfo)
3790   return displayInfo(config, kernelInfo, bootPrefix);   return displayInfo(config, kernelInfo, bootPrefix);
3791    
# Line 2585  int main(int argc, const char ** argv) { Line 3801  int main(int argc, const char ** argv) {
3801      setFallbackImage(config, newKernelPath != NULL);      setFallbackImage(config, newKernelPath != NULL);
3802      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
3803                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
3804        if (updateKernelPath && newKernelInitrd) {
3805                if (updateInitrd(config, updateKernelPath, bootPrefix,
3806                                 newKernelInitrd)) return 1;
3807        }
3808      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
3809                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
3810                         (const char **)extraInitrds, extraInitrdCount,
3811                       newMBKernel, newMBKernelArgs)) return 1;                       newMBKernel, newMBKernelArgs)) return 1;
3812            
3813    
# Line 2597  int main(int argc, const char ** argv) { Line 3818  int main(int argc, const char ** argv) {
3818      }      }
3819    
3820      if (!outputFile)      if (!outputFile)
3821   outputFile = grubConfig;   outputFile = (char *)grubConfig;
3822    
3823      return writeConfig(config, outputFile, bootPrefix);      return writeConfig(config, outputFile, bootPrefix);
3824  }  }

Legend:
Removed from v.532  
changed lines
  Added in v.1849