Magellan Linux

Diff of /trunk/grubby/grubby.c

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

revision 1748 by niro, Sat Feb 18 01:07:15 2012 UTC revision 2682 by niro, Wed Jul 16 09:49:24 2014 UTC
# Line 36  Line 36 
36  #include <signal.h>  #include <signal.h>
37  #include <blkid/blkid.h>  #include <blkid/blkid.h>
38    
39    #include "log.h"
40    
41  #ifndef DEBUG  #ifndef DEBUG
42  #define DEBUG 0  #define DEBUG 0
43  #endif  #endif
# Line 56  int debug = 0; /* Currently just for tem Line 58  int debug = 0; /* Currently just for tem
58  #define NOOP_OPCODE 0x90  #define NOOP_OPCODE 0x90
59  #define JMP_SHORT_OPCODE 0xeb  #define JMP_SHORT_OPCODE 0xeb
60    
61    int isEfi = 0;
62    
63    char *saved_command_line = NULL;
64    
65  /* comments get lumped in with indention */  /* comments get lumped in with indention */
66  struct lineElement {  struct lineElement {
67      char * item;      char * item;
# Line 82  enum lineType_e { Line 88  enum lineType_e {
88      LT_MENUENTRY    = 1 << 17,      LT_MENUENTRY    = 1 << 17,
89      LT_ENTRY_END    = 1 << 18,      LT_ENTRY_END    = 1 << 18,
90      LT_SET_VARIABLE = 1 << 19,      LT_SET_VARIABLE = 1 << 19,
91      LT_UNKNOWN      = 1 << 20,      LT_KERNEL_EFI   = 1 << 20,
92        LT_INITRD_EFI   = 1 << 21,
93        LT_UNKNOWN      = 1 << 22,
94  };  };
95    
96  struct singleLine {  struct singleLine {
# Line 128  struct configFileInfo; Line 136  struct configFileInfo;
136  typedef const char *(*findConfigFunc)(struct configFileInfo *);  typedef const char *(*findConfigFunc)(struct configFileInfo *);
137  typedef const int (*writeLineFunc)(struct configFileInfo *,  typedef const int (*writeLineFunc)(struct configFileInfo *,
138   struct singleLine *line);   struct singleLine *line);
139    typedef char *(*getEnvFunc)(struct configFileInfo *, char *name);
140    typedef int (*setEnvFunc)(struct configFileInfo *, char *name, char *value);
141    
142  struct configFileInfo {  struct configFileInfo {
143      char * defaultConfig;      char * defaultConfig;
144      findConfigFunc findConfig;      findConfigFunc findConfig;
145      writeLineFunc writeLine;      writeLineFunc writeLine;
146        getEnvFunc getEnv;
147        setEnvFunc setEnv;
148      struct keywordTypes * keywords;      struct keywordTypes * keywords;
149        int caseInsensitive;
150      int defaultIsIndex;      int defaultIsIndex;
151      int defaultIsVariable;      int defaultIsVariable;
152      int defaultSupportSaved;      int defaultSupportSaved;
153        int defaultIsSaved;
154      enum lineType_e entryStart;      enum lineType_e entryStart;
155      enum lineType_e entryEnd;      enum lineType_e entryEnd;
156      int needsBootPrefix;      int needsBootPrefix;
# Line 148  struct configFileInfo { Line 162  struct configFileInfo {
162      int mbInitRdIsModule;      int mbInitRdIsModule;
163      int mbConcatArgs;      int mbConcatArgs;
164      int mbAllowExtraInitRds;      int mbAllowExtraInitRds;
165        char *envFile;
166  };  };
167    
168  struct keywordTypes grubKeywords[] = {  struct keywordTypes grubKeywords[] = {
# Line 164  struct keywordTypes grubKeywords[] = { Line 179  struct keywordTypes grubKeywords[] = {
179    
180  const char *grubFindConfig(struct configFileInfo *cfi) {  const char *grubFindConfig(struct configFileInfo *cfi) {
181      static const char *configFiles[] = {      static const char *configFiles[] = {
  "/etc/grub.conf",  
182   "/boot/grub/grub.conf",   "/boot/grub/grub.conf",
183   "/boot/grub/menu.lst",   "/boot/grub/menu.lst",
184     "/etc/grub.conf",
185     "/boot/grub2/grub.cfg",
186     "/boot/grub2-efi/grub.cfg",
187   NULL   NULL
188      };      };
189      static int i = -1;      static int i = -1;
# Line 205  struct keywordTypes grub2Keywords[] = { Line 222  struct keywordTypes grub2Keywords[] = {
222      { "default",    LT_DEFAULT,     ' ' },      { "default",    LT_DEFAULT,     ' ' },
223      { "fallback",   LT_FALLBACK,    ' ' },      { "fallback",   LT_FALLBACK,    ' ' },
224      { "linux",      LT_KERNEL,      ' ' },      { "linux",      LT_KERNEL,      ' ' },
225        { "linuxefi",   LT_KERNEL_EFI,  ' ' },
226      { "initrd",     LT_INITRD,      ' ', ' ' },      { "initrd",     LT_INITRD,      ' ', ' ' },
227        { "initrdefi",  LT_INITRD_EFI,  ' ', ' ' },
228      { "module",     LT_MBMODULE,    ' ' },      { "module",     LT_MBMODULE,    ' ' },
229      { "kernel",     LT_HYPER,       ' ' },      { "kernel",     LT_HYPER,       ' ' },
230      { NULL, 0, 0 },      { NULL, 0, 0 },
# Line 219  const char *grub2FindConfig(struct confi Line 238  const char *grub2FindConfig(struct confi
238      };      };
239      static int i = -1;      static int i = -1;
240      static const char *grub_cfg = "/boot/grub/grub.cfg";      static const char *grub_cfg = "/boot/grub/grub.cfg";
241        int rc = -1;
242    
243      if (i == -1) {      if (i == -1) {
244   for (i = 0; configFiles[i] != NULL; i++) {   for (i = 0; configFiles[i] != NULL; i++) {
245      dbgPrintf("Checking \"%s\": ", configFiles[i]);      dbgPrintf("Checking \"%s\": ", configFiles[i]);
246      if (!access(configFiles[i], R_OK)) {      if ((rc = access(configFiles[i], R_OK))) {
247     if (errno == EACCES) {
248        printf("Unable to access bootloader configuration file "
249           "\"%s\": %m\n", configFiles[i]);
250        exit(1);
251     }
252     continue;
253        } else {
254   dbgPrintf("found\n");   dbgPrintf("found\n");
255   return configFiles[i];   return configFiles[i];
256      }      }
# Line 242  const char *grub2FindConfig(struct confi Line 269  const char *grub2FindConfig(struct confi
269      return configFiles[i];      return configFiles[i];
270  }  }
271    
272    /* kind of hacky.  It'll give the first 1024 bytes, ish. */
273    static char *grub2GetEnv(struct configFileInfo *info, char *name)
274    {
275        static char buf[1025];
276        char *s = NULL;
277        char *ret = NULL;
278        char *envFile = info->envFile ? info->envFile : "/boot/grub/grubenv";
279        int rc = asprintf(&s, "grub-editenv %s list | grep '^%s='", envFile, name);
280    
281        if (rc < 0)
282     return NULL;
283    
284        FILE *f = popen(s, "r");
285        if (!f)
286     goto out;
287    
288        memset(buf, '\0', sizeof (buf));
289        ret = fgets(buf, 1024, f);
290        pclose(f);
291    
292        if (ret) {
293     ret += strlen(name) + 1;
294     ret[strlen(ret) - 1] = '\0';
295        }
296        dbgPrintf("grub2GetEnv(%s): %s\n", name, ret);
297    out:
298        free(s);
299        return ret;
300    }
301    
302    static int sPopCount(const char *s, const char *c)
303    {
304        int ret = 0;
305        if (!s)
306     return -1;
307        for (int i = 0; s[i] != '\0'; i++)
308     for (int j = 0; c[j] != '\0'; j++)
309        if (s[i] == c[j])
310     ret++;
311        return ret;
312    }
313    
314    static char *shellEscape(const char *s)
315    {
316        int l = strlen(s) + sPopCount(s, "'") * 2;
317    
318        char *ret = calloc(l+1, sizeof (*ret));
319        if (!ret)
320     return NULL;
321        for (int i = 0, j = 0; s[i] != '\0'; i++, j++) {
322     if (s[i] == '\'')
323        ret[j++] = '\\';
324     ret[j] = s[i];
325        }
326        return ret;
327    }
328    
329    static void unquote(char *s)
330    {
331        int l = strlen(s);
332    
333        if ((s[l-1] == '\'' && s[0] == '\'') || (s[l-1] == '"' && s[0] == '"')) {
334     memmove(s, s+1, l-2);
335     s[l-2] = '\0';
336        }
337    }
338    
339    static int grub2SetEnv(struct configFileInfo *info, char *name, char *value)
340    {
341        char *s = NULL;
342        int rc = 0;
343        char *envFile = info->envFile ? info->envFile : "/boot/grub/grubenv";
344    
345        unquote(value);
346        value = shellEscape(value);
347        if (!value)
348        return -1;
349    
350        rc = asprintf(&s, "grub-editenv %s set '%s=%s'", envFile, name, value);
351        free(value);
352        if (rc <0)
353     return -1;
354    
355        dbgPrintf("grub2SetEnv(%s): %s\n", name, s);
356        rc = system(s);
357        free(s);
358        return rc;
359    }
360    
361    /* this is a gigantic hack to avoid clobbering grub2 variables... */
362    static int is_special_grub2_variable(const char *name)
363    {
364        if (!strcmp(name,"\"${next_entry}\""))
365     return 1;
366        if (!strcmp(name,"\"${prev_saved_entry}\""))
367     return 1;
368        return 0;
369    }
370    
371  int sizeOfSingleLine(struct singleLine * line) {  int sizeOfSingleLine(struct singleLine * line) {
   int i;  
372    int count = 0;    int count = 0;
373    
374    for (i = 0; i < line->numElements; i++) {    for (int i = 0; i < line->numElements; i++) {
375      int indentSize = 0;      int indentSize = 0;
376    
377      count = count + strlen(line->elements[i].item);      count = count + strlen(line->elements[i].item);
# Line 265  int sizeOfSingleLine(struct singleLine * Line 390  int sizeOfSingleLine(struct singleLine *
390    return count;    return count;
391  }  }
392    
393    static int isquote(char q)
394    {
395        if (q == '\'' || q == '\"')
396     return 1;
397        return 0;
398    }
399    
400    static int iskernel(enum lineType_e type) {
401        return (type == LT_KERNEL || type == LT_KERNEL_EFI);
402    }
403    
404    static int isinitrd(enum lineType_e type) {
405        return (type == LT_INITRD || type == LT_INITRD_EFI);
406    }
407    
408  char *grub2ExtractTitle(struct singleLine * line) {  char *grub2ExtractTitle(struct singleLine * line) {
409      char * current;      char * current;
410      char * current_indent;      char * current_indent;
# Line 281  char *grub2ExtractTitle(struct singleLin Line 421  char *grub2ExtractTitle(struct singleLin
421      current_len = strlen(current);      current_len = strlen(current);
422    
423      /* if second word is quoted, strip the quotes and return single word */      /* if second word is quoted, strip the quotes and return single word */
424      if ((*current == '\'') && (*(current + current_len - 1) == '\'')) {      if (isquote(*current) && isquote(current[current_len - 1])) {
425        char *tmp;   char *tmp;
426    
427        tmp = strdup(current);   tmp = strdup(current);
428        *(tmp + current_len - 1) = '\0';   *(tmp + current_len - 1) = '\0';
429        return ++tmp;   return ++tmp;
430      }      }
431    
432      /* if no quotes, return second word verbatim */      /* if no quotes, return second word verbatim */
433      if (*current != '\'') {      if (!isquote(*current))
434        return current;   return current;
     }  
435    
436      /* second element start with a quote, so we have to find the element      /* second element start with a quote, so we have to find the element
437       * whose last character is also quote (assuming it's the closing one) */       * whose last character is also quote (assuming it's the closing one) */
438      if (*current == '\'') {      int resultMaxSize;
439        int resultMaxSize;      char * result;
440        char * result;      
441        resultMaxSize = sizeOfSingleLine(line);
442        resultMaxSize = sizeOfSingleLine(line);      result = malloc(resultMaxSize);
443        result = malloc(resultMaxSize);      snprintf(result, resultMaxSize, "%s", ++current);
444        snprintf(result, resultMaxSize, "%s", ++current);      
445        i++;
446        i++;      for (; i < line->numElements; ++i) {
       for (; i < line->numElements; ++i) {  
447   current = line->elements[i].item;   current = line->elements[i].item;
448   current_len = strlen(current);   current_len = strlen(current);
449   current_indent = line->elements[i].indent;   current_indent = line->elements[i].indent;
450   current_indent_len = strlen(current_indent);   current_indent_len = strlen(current_indent);
451    
452   strncat(result, current_indent, current_indent_len);   strncat(result, current_indent, current_indent_len);
453   if (*(current + current_len - 1) != '\'') {   if (!isquote(current[current_len-1])) {
454    strncat(result, current, current_len);      strncat(result, current, current_len);
455   } else {   } else {
456    strncat(result, current, current_len - 1);      strncat(result, current, current_len - 1);
457    break;      break;
458   }   }
       }  
       return result;  
459      }      }
460        return result;
     return NULL;  
461  }  }
462    
463  struct configFileInfo grub2ConfigType = {  struct configFileInfo grub2ConfigType = {
464      .findConfig = grub2FindConfig,      .findConfig = grub2FindConfig,
465        .getEnv = grub2GetEnv,
466        .setEnv = grub2SetEnv,
467      .keywords = grub2Keywords,      .keywords = grub2Keywords,
468      .defaultIsIndex = 1,      .defaultIsIndex = 1,
469      .defaultSupportSaved = 1,      .defaultSupportSaved = 1,
# Line 481  struct configFileInfo ziplConfigType = { Line 618  struct configFileInfo ziplConfigType = {
618  struct configFileInfo extlinuxConfigType = {  struct configFileInfo extlinuxConfigType = {
619      .defaultConfig = "/boot/extlinux/extlinux.conf",      .defaultConfig = "/boot/extlinux/extlinux.conf",
620      .keywords = extlinuxKeywords,      .keywords = extlinuxKeywords,
621        .caseInsensitive = 1,
622      .entryStart = LT_TITLE,      .entryStart = LT_TITLE,
623      .needsBootPrefix = 1,      .needsBootPrefix = 1,
624      .maxTitleLength = 255,      .maxTitleLength = 255,
# Line 505  struct singleEntry * findEntryByIndex(st Line 643  struct singleEntry * findEntryByIndex(st
643  struct singleEntry * findEntryByPath(struct grubConfig * cfg,  struct singleEntry * findEntryByPath(struct grubConfig * cfg,
644       const char * path, const char * prefix,       const char * path, const char * prefix,
645       int * index);       int * index);
646    struct singleEntry * findEntryByTitle(struct grubConfig * cfg, char *title,
647          int * index);
648  static int readFile(int fd, char ** bufPtr);  static int readFile(int fd, char ** bufPtr);
649  static void lineInit(struct singleLine * line);  static void lineInit(struct singleLine * line);
650  struct singleLine * lineDup(struct singleLine * line);  struct singleLine * lineDup(struct singleLine * line);
# Line 569  static char * sdupprintf(const char *for Line 709  static char * sdupprintf(const char *for
709      return buf;      return buf;
710  }  }
711    
712    static enum lineType_e preferredLineType(enum lineType_e type,
713     struct configFileInfo *cfi) {
714        if (isEfi && cfi == &grub2ConfigType) {
715     switch (type) {
716     case LT_KERNEL:
717        return LT_KERNEL_EFI;
718     case LT_INITRD:
719        return LT_INITRD_EFI;
720     default:
721        return type;
722     }
723        }
724        return type;
725    }
726    
727  static struct keywordTypes * getKeywordByType(enum lineType_e type,  static struct keywordTypes * getKeywordByType(enum lineType_e type,
728        struct configFileInfo * cfi) {        struct configFileInfo * cfi) {
729      struct keywordTypes * kw;      for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
     for (kw = cfi->keywords; kw->key; kw++) {  
730   if (kw->type == type)   if (kw->type == type)
731      return kw;      return kw;
732      }      }
# Line 602  static char * getuuidbydev(char *device) Line 756  static char * getuuidbydev(char *device)
756    
757  static enum lineType_e getTypeByKeyword(char * keyword,  static enum lineType_e getTypeByKeyword(char * keyword,
758   struct configFileInfo * cfi) {   struct configFileInfo * cfi) {
759      struct keywordTypes * kw;      for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
760      for (kw = cfi->keywords; kw->key; kw++) {   if (cfi->caseInsensitive) {
761   if (!strcmp(keyword, kw->key))      if (!strcasecmp(keyword, kw->key))
762      return kw->type;                  return kw->type;
763     } else {
764        if (!strcmp(keyword, kw->key))
765            return kw->type;
766     }
767      }      }
768      return LT_UNKNOWN;      return LT_UNKNOWN;
769  }  }
# Line 644  static int isEntryStart(struct singleLin Line 802  static int isEntryStart(struct singleLin
802  /* extract the title from within brackets (for zipl) */  /* extract the title from within brackets (for zipl) */
803  static char * extractTitle(struct singleLine * line) {  static char * extractTitle(struct singleLine * line) {
804      /* bracketed title... let's extract it (leaks a byte) */      /* bracketed title... let's extract it (leaks a byte) */
805      char * title;      char * title = NULL;
806      title = strdup(line->elements[0].item);      if (line->type == LT_TITLE) {
807      title++;   title = strdup(line->elements[0].item);
808      *(title + strlen(title) - 1) = '\0';   title++;
809     *(title + strlen(title) - 1) = '\0';
810        } else if (line->type == LT_MENUENTRY)
811     title = strdup(line->elements[1].item);
812        else
813     return NULL;
814      return title;      return title;
815  }  }
816    
# Line 690  static void lineInit(struct singleLine * Line 853  static void lineInit(struct singleLine *
853  }  }
854    
855  struct singleLine * lineDup(struct singleLine * line) {  struct singleLine * lineDup(struct singleLine * line) {
     int i;  
856      struct singleLine * newLine = malloc(sizeof(*newLine));      struct singleLine * newLine = malloc(sizeof(*newLine));
857    
858      newLine->indent = strdup(line->indent);      newLine->indent = strdup(line->indent);
# Line 700  struct singleLine * lineDup(struct singl Line 862  struct singleLine * lineDup(struct singl
862      newLine->elements = malloc(sizeof(*newLine->elements) *      newLine->elements = malloc(sizeof(*newLine->elements) *
863         newLine->numElements);         newLine->numElements);
864    
865      for (i = 0; i < newLine->numElements; i++) {      for (int i = 0; i < newLine->numElements; i++) {
866   newLine->elements[i].indent = strdup(line->elements[i].indent);   newLine->elements[i].indent = strdup(line->elements[i].indent);
867   newLine->elements[i].item = strdup(line->elements[i].item);   newLine->elements[i].item = strdup(line->elements[i].item);
868      }      }
# Line 709  struct singleLine * lineDup(struct singl Line 871  struct singleLine * lineDup(struct singl
871  }  }
872    
873  static void lineFree(struct singleLine * line) {  static void lineFree(struct singleLine * line) {
     int i;  
   
874      if (line->indent) free(line->indent);      if (line->indent) free(line->indent);
875    
876      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
877   free(line->elements[i].item);   free(line->elements[i].item);
878   free(line->elements[i].indent);   free(line->elements[i].indent);
879      }      }
# Line 724  static void lineFree(struct singleLine * Line 884  static void lineFree(struct singleLine *
884    
885  static int lineWrite(FILE * out, struct singleLine * line,  static int lineWrite(FILE * out, struct singleLine * line,
886       struct configFileInfo * cfi) {       struct configFileInfo * cfi) {
     int i;  
   
887      if (fprintf(out, "%s", line->indent) == -1) return -1;      if (fprintf(out, "%s", line->indent) == -1) return -1;
888    
889      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
890     /* Need to handle this, because we strip the quotes from
891     * menuentry when read it. */
892     if (line->type == LT_MENUENTRY && i == 1) {
893        if(!isquote(*line->elements[i].item))
894     fprintf(out, "\'%s\'", line->elements[i].item);
895        else
896     fprintf(out, "%s", line->elements[i].item);
897        fprintf(out, "%s", line->elements[i].indent);
898    
899        continue;
900     }
901    
902   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)
903      if (fputc('"', out) == EOF) return -1;      if (fputc('"', out) == EOF) return -1;
904    
# Line 822  static int getNextLine(char ** bufPtr, s Line 992  static int getNextLine(char ** bufPtr, s
992      if (*line->elements[0].item == '#') {      if (*line->elements[0].item == '#') {
993   char * fullLine;   char * fullLine;
994   int len;   int len;
  int i;  
995    
996   len = strlen(line->indent);   len = strlen(line->indent);
997   for (i = 0; i < line->numElements; i++)   for (int i = 0; i < line->numElements; i++)
998      len += strlen(line->elements[i].item) +      len += strlen(line->elements[i].item) +
999     strlen(line->elements[i].indent);     strlen(line->elements[i].indent);
1000    
# Line 834  static int getNextLine(char ** bufPtr, s Line 1003  static int getNextLine(char ** bufPtr, s
1003   free(line->indent);   free(line->indent);
1004   line->indent = fullLine;   line->indent = fullLine;
1005    
1006   for (i = 0; i < line->numElements; i++) {   for (int i = 0; i < line->numElements; i++) {
1007      strcat(fullLine, line->elements[i].item);      strcat(fullLine, line->elements[i].item);
1008      strcat(fullLine, line->elements[i].indent);      strcat(fullLine, line->elements[i].indent);
1009      free(line->elements[i].item);      free(line->elements[i].item);
# Line 853  static int getNextLine(char ** bufPtr, s Line 1022  static int getNextLine(char ** bufPtr, s
1022   * elements up more   * elements up more
1023   */   */
1024   if (!isspace(kw->separatorChar)) {   if (!isspace(kw->separatorChar)) {
     int i;  
1025      char indent[2] = "";      char indent[2] = "";
1026      indent[0] = kw->separatorChar;      indent[0] = kw->separatorChar;
1027      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
1028   char *p;   char *p;
  int j;  
1029   int numNewElements;   int numNewElements;
1030    
1031   numNewElements = 0;   numNewElements = 0;
# Line 874  static int getNextLine(char ** bufPtr, s Line 1041  static int getNextLine(char ** bufPtr, s
1041      sizeof(*line->elements) * elementsAlloced);      sizeof(*line->elements) * elementsAlloced);
1042   }   }
1043    
1044   for (j = line->numElements; j > i; j--) {   for (int j = line->numElements; j > i; j--) {
1045   line->elements[j + numNewElements] = line->elements[j];   line->elements[j + numNewElements] = line->elements[j];
1046   }   }
1047   line->numElements += numNewElements;   line->numElements += numNewElements;
# Line 887  static int getNextLine(char ** bufPtr, s Line 1054  static int getNextLine(char ** bufPtr, s
1054   break;   break;
1055   }   }
1056    
1057   free(line->elements[i].indent);   line->elements[i + 1].indent = line->elements[i].indent;
1058   line->elements[i].indent = strdup(indent);   line->elements[i].indent = strdup(indent);
1059   *p++ = '\0';   *p++ = '\0';
1060   i++;   i++;
1061   line->elements[i].item = strdup(p);   line->elements[i].item = strdup(p);
  line->elements[i].indent = strdup("");  
  p = line->elements[i].item;  
1062   }   }
1063      }      }
1064   }   }
# Line 903  static int getNextLine(char ** bufPtr, s Line 1068  static int getNextLine(char ** bufPtr, s
1068      return 0;      return 0;
1069  }  }
1070    
1071    static int isnumber(const char *s)
1072    {
1073        int i;
1074        for (i = 0; s[i] != '\0'; i++)
1075     if (s[i] < '0' || s[i] > '9')
1076        return 0;
1077        return i;
1078    }
1079    
1080  static struct grubConfig * readConfig(const char * inName,  static struct grubConfig * readConfig(const char * inName,
1081        struct configFileInfo * cfi) {        struct configFileInfo * cfi) {
1082      int in;      int in;
# Line 914  static struct grubConfig * readConfig(co Line 1088  static struct grubConfig * readConfig(co
1088      struct singleLine * last = NULL, * line, * defaultLine = NULL;      struct singleLine * last = NULL, * line, * defaultLine = NULL;
1089      char * end;      char * end;
1090      struct singleEntry * entry = NULL;      struct singleEntry * entry = NULL;
1091      int i, len;      int len;
1092      char * buf;      char * buf;
1093    
1094      if (!strcmp(inName, "-")) {      if (inName == NULL) {
1095            printf("Could not find bootloader configuration\n");
1096            exit(1);
1097        } else if (!strcmp(inName, "-")) {
1098   in = 0;   in = 0;
1099      } else {      } else {
1100   if ((in = open(inName, O_RDONLY)) < 0) {   if ((in = open(inName, O_RDONLY)) < 0) {
# Line 977  static struct grubConfig * readConfig(co Line 1154  static struct grubConfig * readConfig(co
1154   }   }
1155    
1156   if (line->type == LT_SET_VARIABLE) {   if (line->type == LT_SET_VARIABLE) {
     int i;  
1157      dbgPrintf("found 'set' command (%d elements): ", line->numElements);      dbgPrintf("found 'set' command (%d elements): ", line->numElements);
1158      dbgPrintf("%s", line->indent);      dbgPrintf("%s", line->indent);
1159      for (i = 0; i < line->numElements; i++)      for (int i = 0; i < line->numElements; i++)
1160   dbgPrintf("%s\"%s\"", line->elements[i].indent, line->elements[i].item);   dbgPrintf("\"%s\"%s", line->elements[i].item, line->elements[i].indent);
1161      dbgPrintf("\n");      dbgPrintf("\n");
1162      struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);      struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
1163      if (kwType && line->numElements == 3 &&      if (kwType && line->numElements == 3 &&
1164      !strcmp(line->elements[1].item, kwType->key)) {      !strcmp(line->elements[1].item, kwType->key) &&
1165        !is_special_grub2_variable(line->elements[2].item)) {
1166   dbgPrintf("Line sets default config\n");   dbgPrintf("Line sets default config\n");
1167   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
1168   defaultLine = line;   defaultLine = line;
# Line 994  static struct grubConfig * readConfig(co Line 1171  static struct grubConfig * readConfig(co
1171      cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;      cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
1172      defaultLine = line;      defaultLine = line;
1173    
1174          } else if (line->type == LT_KERNEL) {          } else if (iskernel(line->type)) {
1175      /* if by some freak chance this is multiboot and the "module"      /* if by some freak chance this is multiboot and the "module"
1176       * lines came earlier in the template, make sure to use LT_HYPER       * lines came earlier in the template, make sure to use LT_HYPER
1177       * instead of LT_KERNEL now       * instead of LT_KERNEL now
# Line 1008  static struct grubConfig * readConfig(co Line 1185  static struct grubConfig * readConfig(co
1185       * This only applies to grub, but that's the only place we       * This only applies to grub, but that's the only place we
1186       * should find LT_MBMODULE lines anyway.       * should find LT_MBMODULE lines anyway.
1187       */       */
1188      struct singleLine * l;      for (struct singleLine *l = entry->lines; l; l = l->next) {
     for (l = entry->lines; l; l = l->next) {  
1189   if (l->type == LT_HYPER)   if (l->type == LT_HYPER)
1190      break;      break;
1191   else if (l->type == LT_KERNEL) {   else if (iskernel(l->type)) {
1192      l->type = LT_HYPER;      l->type = LT_HYPER;
1193      break;      break;
1194   }   }
# Line 1029  static struct grubConfig * readConfig(co Line 1205  static struct grubConfig * readConfig(co
1205   } else if (line->type == LT_TITLE && line->numElements > 1) {   } else if (line->type == LT_TITLE && line->numElements > 1) {
1206      /* make the title a single argument (undoing our parsing) */      /* make the title a single argument (undoing our parsing) */
1207      len = 0;      len = 0;
1208      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
1209   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
1210   len += strlen(line->elements[i].indent);   len += strlen(line->elements[i].indent);
1211      }      }
1212      buf = malloc(len + 1);      buf = malloc(len + 1);
1213      *buf = '\0';      *buf = '\0';
1214    
1215      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
1216   strcat(buf, line->elements[i].item);   strcat(buf, line->elements[i].item);
1217   free(line->elements[i].item);   free(line->elements[i].item);
1218    
# Line 1050  static struct grubConfig * readConfig(co Line 1226  static struct grubConfig * readConfig(co
1226      line->elements[line->numElements - 1].indent;      line->elements[line->numElements - 1].indent;
1227      line->elements[1].item = buf;      line->elements[1].item = buf;
1228      line->numElements = 2;      line->numElements = 2;
1229     } else if (line->type == LT_MENUENTRY && line->numElements > 3) {
1230        /* let --remove-kernel="TITLE=what" work */
1231        len = 0;
1232        char *extras;
1233        char *title;
1234    
1235        for (int i = 1; i < line->numElements; i++) {
1236     len += strlen(line->elements[i].item);
1237     len += strlen(line->elements[i].indent);
1238        }
1239        buf = malloc(len + 1);
1240        *buf = '\0';
1241    
1242        /* allocate mem for extra flags. */
1243        extras = malloc(len + 1);
1244        *extras = '\0';
1245    
1246        /* get title. */
1247        for (int i = 0; i < line->numElements; i++) {
1248     if (!strcmp(line->elements[i].item, "menuentry"))
1249        continue;
1250     if (isquote(*line->elements[i].item))
1251        title = line->elements[i].item + 1;
1252     else
1253        title = line->elements[i].item;
1254    
1255     len = strlen(title);
1256            if (isquote(title[len-1])) {
1257        strncat(buf, title,len-1);
1258        break;
1259     } else {
1260        strcat(buf, title);
1261        strcat(buf, line->elements[i].indent);
1262     }
1263        }
1264    
1265        /* get extras */
1266        int count = 0;
1267        for (int i = 0; i < line->numElements; i++) {
1268     if (count >= 2) {
1269        strcat(extras, line->elements[i].item);
1270        strcat(extras, line->elements[i].indent);
1271     }
1272    
1273     if (!strcmp(line->elements[i].item, "menuentry"))
1274        continue;
1275    
1276     /* count ' or ", there should be two in menuentry line. */
1277     if (isquote(*line->elements[i].item))
1278        count++;
1279    
1280     len = strlen(line->elements[i].item);
1281    
1282     if (isquote(line->elements[i].item[len -1]))
1283        count++;
1284    
1285     /* ok, we get the final ' or ", others are extras. */
1286                }
1287        line->elements[1].indent =
1288     line->elements[line->numElements - 2].indent;
1289        line->elements[1].item = buf;
1290        line->elements[2].indent =
1291     line->elements[line->numElements - 2].indent;
1292        line->elements[2].item = extras;
1293        line->numElements = 3;
1294   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {
1295      /* Strip off any " which may be present; they'll be put back      /* Strip off any " which may be present; they'll be put back
1296         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 1059  static struct grubConfig * readConfig(co Line 1299  static struct grubConfig * readConfig(co
1299      if (line->numElements >= 2) {      if (line->numElements >= 2) {
1300   int last, len;   int last, len;
1301    
1302   if (*line->elements[1].item == '"')   if (isquote(*line->elements[1].item))
1303      memmove(line->elements[1].item, line->elements[1].item + 1,      memmove(line->elements[1].item, line->elements[1].item + 1,
1304      strlen(line->elements[1].item + 1) + 1);      strlen(line->elements[1].item + 1) + 1);
1305    
1306   last = line->numElements - 1;   last = line->numElements - 1;
1307   len = strlen(line->elements[last].item) - 1;   len = strlen(line->elements[last].item) - 1;
1308   if (line->elements[last].item[len] == '"')   if (isquote(line->elements[last].item[len]))
1309      line->elements[last].item[len] = '\0';      line->elements[last].item[len] = '\0';
1310      }      }
1311   }   }
# Line 1127  static struct grubConfig * readConfig(co Line 1367  static struct grubConfig * readConfig(co
1367          if (defaultLine->numElements > 2 &&          if (defaultLine->numElements > 2 &&
1368      cfi->defaultSupportSaved &&      cfi->defaultSupportSaved &&
1369      !strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {      !strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {
1370      cfg->defaultImage = DEFAULT_SAVED_GRUB2;   cfg->cfi->defaultIsSaved = 1;
1371     cfg->defaultImage = DEFAULT_SAVED_GRUB2;
1372     if (cfg->cfi->getEnv) {
1373        char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
1374        if (defTitle) {
1375     int index = 0;
1376     if (isnumber(defTitle)) {
1377        index = atoi(defTitle);
1378        entry = findEntryByIndex(cfg, index);
1379     } else {
1380        entry = findEntryByTitle(cfg, defTitle, &index);
1381     }
1382     if (entry)
1383        cfg->defaultImage = index;
1384        }
1385     }
1386   } else if (cfi->defaultIsVariable) {   } else if (cfi->defaultIsVariable) {
1387      char *value = defaultLine->elements[2].item;      char *value = defaultLine->elements[2].item;
1388      while (*value && (*value == '"' || *value == '\'' ||      while (*value && (*value == '"' || *value == '\'' ||
# Line 1145  static struct grubConfig * readConfig(co Line 1400  static struct grubConfig * readConfig(co
1400      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);
1401      if (*end) cfg->defaultImage = -1;      if (*end) cfg->defaultImage = -1;
1402   } else if (defaultLine->numElements >= 2) {   } else if (defaultLine->numElements >= 2) {
1403      i = 0;      int i = 0;
1404      while ((entry = findEntryByIndex(cfg, i))) {      while ((entry = findEntryByIndex(cfg, i))) {
1405   for (line = entry->lines; line; line = line->next)   for (line = entry->lines; line; line = line->next)
1406      if (line->type == LT_TITLE) break;      if (line->type == LT_TITLE) break;
# Line 1168  static struct grubConfig * readConfig(co Line 1423  static struct grubConfig * readConfig(co
1423          cfg->defaultImage = -1;          cfg->defaultImage = -1;
1424      }      }
1425   }   }
1426        } else if (cfg->cfi->defaultIsSaved && cfg->cfi->getEnv) {
1427     char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
1428     if (defTitle) {
1429        int index = 0;
1430        if (isnumber(defTitle)) {
1431     index = atoi(defTitle);
1432     entry = findEntryByIndex(cfg, index);
1433        } else {
1434     entry = findEntryByTitle(cfg, defTitle, &index);
1435        }
1436        if (entry)
1437     cfg->defaultImage = index;
1438     }
1439      } else {      } else {
1440          cfg->defaultImage = 0;          cfg->defaultImage = 0;
1441      }      }
# Line 1185  static void writeDefault(FILE * out, cha Line 1453  static void writeDefault(FILE * out, cha
1453    
1454      if (cfg->defaultImage == DEFAULT_SAVED)      if (cfg->defaultImage == DEFAULT_SAVED)
1455   fprintf(out, "%sdefault%ssaved\n", indent, separator);   fprintf(out, "%sdefault%ssaved\n", indent, separator);
1456      else if (cfg->defaultImage == DEFAULT_SAVED_GRUB2)      else if (cfg->cfi->defaultIsSaved) {
1457   fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);   fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
1458      else if (cfg->defaultImage > -1) {   if (cfg->defaultImage >= 0 && cfg->cfi->setEnv) {
1459        char *title;
1460        entry = findEntryByIndex(cfg, cfg->defaultImage);
1461        line = getLineByType(LT_MENUENTRY, entry->lines);
1462        if (!line)
1463     line = getLineByType(LT_TITLE, entry->lines);
1464        if (line) {
1465     title = extractTitle(line);
1466     if (title)
1467        cfg->cfi->setEnv(cfg->cfi, "saved_entry", title);
1468        }
1469     }
1470        } else if (cfg->defaultImage > -1) {
1471   if (cfg->cfi->defaultIsIndex) {   if (cfg->cfi->defaultIsIndex) {
1472      if (cfg->cfi->defaultIsVariable) {      if (cfg->cfi->defaultIsVariable) {
1473          fprintf(out, "%sset default=\"%d\"\n", indent,          fprintf(out, "%sset default=\"%d\"\n", indent,
# Line 1247  static int writeConfig(struct grubConfig Line 1527  static int writeConfig(struct grubConfig
1527    
1528      /* most likely the symlink is relative, so change our      /* most likely the symlink is relative, so change our
1529         directory to the dir of the symlink */         directory to the dir of the symlink */
1530              rc = chdir(dirname(strdupa(outName)));      char *dir = strdupa(outName);
1531        rc = chdir(dirname(dir));
1532      do {      do {
1533   buf = alloca(len + 1);   buf = alloca(len + 1);
1534   rc = readlink(basename(outName), buf, len);   rc = readlink(basename(outName), buf, len);
# Line 1289  static int writeConfig(struct grubConfig Line 1570  static int writeConfig(struct grubConfig
1570      while (line) {      while (line) {
1571          if (line->type == LT_SET_VARIABLE && defaultKw &&          if (line->type == LT_SET_VARIABLE && defaultKw &&
1572   line->numElements == 3 &&   line->numElements == 3 &&
1573   !strcmp(line->elements[1].item, defaultKw->key)) {   !strcmp(line->elements[1].item, defaultKw->key) &&
1574     !is_special_grub2_variable(line->elements[2].item)) {
1575      writeDefault(out, line->indent, line->elements[0].indent, cfg);      writeDefault(out, line->indent, line->elements[0].indent, cfg);
1576      needs &= ~MAIN_DEFAULT;      needs &= ~MAIN_DEFAULT;
1577   } else if (line->type == LT_DEFAULT) {   } else if (line->type == LT_DEFAULT) {
# Line 1385  static char *findDiskForRoot() Line 1667  static char *findDiskForRoot()
1667      buf[rc] = '\0';      buf[rc] = '\0';
1668      chptr = buf;      chptr = buf;
1669    
1670        char *foundanswer = NULL;
1671    
1672      while (chptr && chptr != buf+rc) {      while (chptr && chptr != buf+rc) {
1673          devname = chptr;          devname = chptr;
1674    
# Line 1412  static char *findDiskForRoot() Line 1696  static char *findDiskForRoot()
1696           * for '/' obviously.           * for '/' obviously.
1697           */           */
1698          if (*(++chptr) == '/' && *(++chptr) == ' ') {          if (*(++chptr) == '/' && *(++chptr) == ' ') {
1699              /*              /* remember the last / entry in mtab */
1700               * Move back 2, which is the first space after the device name, set             foundanswer = devname;
              * it to \0 so strdup will just get the devicename.  
              */  
             chptr -= 2;  
             *chptr = '\0';  
             return strdup(devname);  
1701          }          }
1702    
1703          /* Next line */          /* Next line */
# Line 1427  static char *findDiskForRoot() Line 1706  static char *findDiskForRoot()
1706              chptr++;              chptr++;
1707      }      }
1708    
1709        /* Return the last / entry found */
1710        if (foundanswer) {
1711            chptr = strchr(foundanswer, ' ');
1712            *chptr = '\0';
1713            return strdup(foundanswer);
1714        }
1715    
1716      return NULL;      return NULL;
1717  }  }
1718    
1719  void printEntry(struct singleEntry * entry) {  void printEntry(struct singleEntry * entry, FILE *f) {
1720      int i;      int i;
1721      struct singleLine * line;      struct singleLine * line;
1722    
1723      for (line = entry->lines; line; line = line->next) {      for (line = entry->lines; line; line = line->next) {
1724   fprintf(stderr, "DBG: %s", line->indent);   log_message(f, "DBG: %s", line->indent);
1725   for (i = 0; i < line->numElements; i++) {   for (i = 0; i < line->numElements; i++) {
1726   fprintf(stderr, "%s%s",      /* Need to handle this, because we strip the quotes from
1727         * menuentry when read it. */
1728        if (line->type == LT_MENUENTRY && i == 1) {
1729     if(!isquote(*line->elements[i].item))
1730        log_message(f, "\'%s\'", line->elements[i].item);
1731     else
1732        log_message(f, "%s", line->elements[i].item);
1733     log_message(f, "%s", line->elements[i].indent);
1734    
1735     continue;
1736        }
1737        
1738        log_message(f, "%s%s",
1739      line->elements[i].item, line->elements[i].indent);      line->elements[i].item, line->elements[i].indent);
1740   }   }
1741   fprintf(stderr, "\n");   log_message(f, "\n");
1742      }      }
1743  }  }
1744    
1745  void notSuitablePrintf(struct singleEntry * entry, const char *fmt, ...)  void notSuitablePrintf(struct singleEntry * entry, int okay, const char *fmt, ...)
1746  {  {
1747      va_list argp;      static int once;
1748        va_list argp, argq;
1749    
1750        va_start(argp, fmt);
1751    
1752        va_copy(argq, argp);
1753        if (!once) {
1754     log_time(NULL);
1755     log_message(NULL, "command line: %s\n", saved_command_line);
1756        }
1757        log_message(NULL, "DBG: Image entry %s: ", okay ? "succeeded" : "failed");
1758        log_vmessage(NULL, fmt, argq);
1759    
1760        printEntry(entry, NULL);
1761        va_end(argq);
1762    
1763      if (!debug)      if (!debug) {
1764     once = 1;
1765         va_end(argp);
1766   return;   return;
1767        }
1768    
1769      va_start(argp, fmt);      if (okay) {
1770     va_end(argp);
1771     return;
1772        }
1773    
1774        if (!once)
1775     log_message(stderr, "DBG: command line: %s\n", saved_command_line);
1776        once = 1;
1777      fprintf(stderr, "DBG: Image entry failed: ");      fprintf(stderr, "DBG: Image entry failed: ");
1778      vfprintf(stderr, fmt, argp);      vfprintf(stderr, fmt, argp);
1779      printEntry(entry);      printEntry(entry, stderr);
1780      va_end(argp);      va_end(argp);
1781  }  }
1782    
# Line 1464  static int endswith(const char *s, char Line 1786  static int endswith(const char *s, char
1786  {  {
1787   int slen;   int slen;
1788    
1789   if (!s && !s[0])   if (!s || !s[0])
1790   return 0;   return 0;
1791   slen = strlen(s) - 1;   slen = strlen(s) - 1;
1792    
# Line 1481  int suitableImage(struct singleEntry * e Line 1803  int suitableImage(struct singleEntry * e
1803      char * rootdev;      char * rootdev;
1804    
1805      if (skipRemoved && entry->skip) {      if (skipRemoved && entry->skip) {
1806   notSuitablePrintf(entry, "marked to skip\n");   notSuitablePrintf(entry, 0, "marked to skip\n");
1807   return 0;   return 0;
1808      }      }
1809    
1810      line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);      line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
1811      if (!line) {      if (!line) {
1812   notSuitablePrintf(entry, "no line found\n");   notSuitablePrintf(entry, 0, "no line found\n");
1813   return 0;   return 0;
1814      }      }
1815      if (line->numElements < 2) {      if (line->numElements < 2) {
1816   notSuitablePrintf(entry, "line has only %d elements\n",   notSuitablePrintf(entry, 0, "line has only %d elements\n",
1817      line->numElements);      line->numElements);
1818   return 0;   return 0;
1819      }      }
1820    
1821      if (flags & GRUBBY_BADIMAGE_OKAY) return 1;      if (flags & GRUBBY_BADIMAGE_OKAY) {
1822        notSuitablePrintf(entry, 1, "\n");
1823        return 1;
1824        }
1825    
1826      fullName = alloca(strlen(bootPrefix) +      fullName = alloca(strlen(bootPrefix) +
1827        strlen(line->elements[1].item) + 1);        strlen(line->elements[1].item) + 1);
# Line 1507  int suitableImage(struct singleEntry * e Line 1832  int suitableImage(struct singleEntry * e
1832      sprintf(fullName, "%s%s%s", bootPrefix, hasslash ? "" : "/",      sprintf(fullName, "%s%s%s", bootPrefix, hasslash ? "" : "/",
1833              line->elements[1].item + rootspec_offset);              line->elements[1].item + rootspec_offset);
1834      if (access(fullName, R_OK)) {      if (access(fullName, R_OK)) {
1835   notSuitablePrintf(entry, "access to %s failed\n", fullName);   notSuitablePrintf(entry, 0, "access to %s failed\n", fullName);
1836   return 0;   return 0;
1837      }      }
1838      for (i = 2; i < line->numElements; i++)      for (i = 2; i < line->numElements; i++)
# Line 1528  int suitableImage(struct singleEntry * e Line 1853  int suitableImage(struct singleEntry * e
1853    
1854              /* failed to find one */              /* failed to find one */
1855              if (!line) {              if (!line) {
1856   notSuitablePrintf(entry, "no line found\n");   notSuitablePrintf(entry, 0, "no line found\n");
1857   return 0;   return 0;
1858              }              }
1859    
# Line 1537  int suitableImage(struct singleEntry * e Line 1862  int suitableImage(struct singleEntry * e
1862      if (i < line->numElements)      if (i < line->numElements)
1863          dev = line->elements[i].item + 5;          dev = line->elements[i].item + 5;
1864      else {      else {
1865   notSuitablePrintf(entry, "no root= entry found\n");   notSuitablePrintf(entry, 0, "no root= entry found\n");
1866   /* it failed too...  can't find root= */   /* it failed too...  can't find root= */
1867          return 0;          return 0;
1868              }              }
# Line 1546  int suitableImage(struct singleEntry * e Line 1871  int suitableImage(struct singleEntry * e
1871    
1872      dev = getpathbyspec(dev);      dev = getpathbyspec(dev);
1873      if (!getpathbyspec(dev)) {      if (!getpathbyspec(dev)) {
1874          notSuitablePrintf(entry, "can't find blkid entry for %s\n", dev);          notSuitablePrintf(entry, 0, "can't find blkid entry for %s\n", dev);
1875          return 0;          return 0;
1876      } else      } else
1877   dev = getpathbyspec(dev);   dev = getpathbyspec(dev);
1878    
1879      rootdev = findDiskForRoot();      rootdev = findDiskForRoot();
1880      if (!rootdev) {      if (!rootdev) {
1881          notSuitablePrintf(entry, "can't find root device\n");          notSuitablePrintf(entry, 0, "can't find root device\n");
1882   return 0;   return 0;
1883      }      }
1884    
1885      if (!getuuidbydev(rootdev) || !getuuidbydev(dev)) {      if (!getuuidbydev(rootdev) || !getuuidbydev(dev)) {
1886          notSuitablePrintf(entry, "uuid missing: rootdev %s, dev %s\n",          notSuitablePrintf(entry, 0, "uuid missing: rootdev %s, dev %s\n",
1887   getuuidbydev(rootdev), getuuidbydev(dev));   getuuidbydev(rootdev), getuuidbydev(dev));
1888          free(rootdev);          free(rootdev);
1889          return 0;          return 0;
1890      }      }
1891    
1892      if (strcmp(getuuidbydev(rootdev), getuuidbydev(dev))) {      if (strcmp(getuuidbydev(rootdev), getuuidbydev(dev))) {
1893          notSuitablePrintf(entry, "uuid mismatch: rootdev %s, dev %s\n",          notSuitablePrintf(entry, 0, "uuid mismatch: rootdev %s, dev %s\n",
1894   getuuidbydev(rootdev), getuuidbydev(dev));   getuuidbydev(rootdev), getuuidbydev(dev));
1895   free(rootdev);   free(rootdev);
1896          return 0;          return 0;
1897      }      }
1898    
1899      free(rootdev);      free(rootdev);
1900        notSuitablePrintf(entry, 1, "\n");
1901    
1902      return 1;      return 1;
1903  }  }
# Line 1615  struct singleEntry * findEntryByPath(str Line 1941  struct singleEntry * findEntryByPath(str
1941   entry = findEntryByIndex(config, indexVars[i]);   entry = findEntryByIndex(config, indexVars[i]);
1942   if (!entry) return NULL;   if (!entry) return NULL;
1943    
1944   line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
1945   if (!line) return NULL;   if (!line) return NULL;
1946    
1947   if (index) *index = indexVars[i];   if (index) *index = indexVars[i];
# Line 1653  struct singleEntry * findEntryByPath(str Line 1979  struct singleEntry * findEntryByPath(str
1979    
1980   if (!strncmp(kernel, "TITLE=", 6)) {   if (!strncmp(kernel, "TITLE=", 6)) {
1981      prefix = "";      prefix = "";
1982      checkType = LT_TITLE;      checkType = LT_TITLE|LT_MENUENTRY;
1983      kernel += 6;      kernel += 6;
1984   }   }
1985    
# Line 1664  struct singleEntry * findEntryByPath(str Line 1990  struct singleEntry * findEntryByPath(str
1990    
1991      /* check all the lines matching checkType */      /* check all the lines matching checkType */
1992      for (line = entry->lines; line; line = line->next) {      for (line = entry->lines; line; line = line->next) {
1993   line = getLineByType(entry->multiboot && checkType == LT_KERNEL ?   enum lineType_e ct = checkType;
1994       LT_KERNEL|LT_MBMODULE|LT_HYPER :   if (entry->multiboot && checkType == LT_KERNEL)
1995       checkType, line);      ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER;
1996   if (!line) break;  /* not found in this entry */   else if (checkType & LT_KERNEL)
1997        ct = checkType | LT_KERNEL_EFI;
1998     line = getLineByType(ct, line);
1999     if (!line)
2000        break;  /* not found in this entry */
2001    
2002   if (line && line->numElements >= 2) {   if (line && line->type != LT_MENUENTRY &&
2003     line->numElements >= 2) {
2004      rootspec = getRootSpecifier(line->elements[1].item);      rootspec = getRootSpecifier(line->elements[1].item);
2005      if (!strcmp(line->elements[1].item +      if (!strcmp(line->elements[1].item +
2006   ((rootspec != NULL) ? strlen(rootspec) : 0),   ((rootspec != NULL) ? strlen(rootspec) : 0),
2007   kernel + strlen(prefix)))   kernel + strlen(prefix)))
2008   break;   break;
2009   }   }
2010     if(line->type == LT_MENUENTRY &&
2011     !strcmp(line->elements[1].item, kernel))
2012        break;
2013      }      }
2014    
2015      /* make sure this entry has a kernel identifier; this skips      /* make sure this entry has a kernel identifier; this skips
2016       * non-Linux boot entries (could find netbsd etc, though, which is       * non-Linux boot entries (could find netbsd etc, though, which is
2017       * unfortunate)       * unfortunate)
2018       */       */
2019      if (line && getLineByType(LT_KERNEL|LT_HYPER, entry->lines))      if (line && getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines))
2020   break; /* found 'im! */   break; /* found 'im! */
2021   }   }
2022    
# Line 1692  struct singleEntry * findEntryByPath(str Line 2026  struct singleEntry * findEntryByPath(str
2026      return entry;      return entry;
2027  }  }
2028    
2029    struct singleEntry * findEntryByTitle(struct grubConfig * cfg, char *title,
2030          int * index) {
2031        struct singleEntry * entry;
2032        struct singleLine * line;
2033        int i;
2034        char * newtitle;
2035    
2036        for (i = 0, entry = cfg->entries; entry; entry = entry->next, i++) {
2037     if (index && i < *index)
2038        continue;
2039     line = getLineByType(LT_TITLE, entry->lines);
2040     if (!line)
2041        line = getLineByType(LT_MENUENTRY, entry->lines);
2042     if (!line)
2043        continue;
2044     newtitle = grub2ExtractTitle(line);
2045     if (!newtitle)
2046        continue;
2047     if (!strcmp(title, newtitle))
2048        break;
2049        }
2050    
2051        if (!entry)
2052     return NULL;
2053    
2054        if (index)
2055     *index = i;
2056        return entry;
2057    }
2058    
2059  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index) {  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index) {
2060      struct singleEntry * entry;      struct singleEntry * entry;
2061    
# Line 1714  struct singleEntry * findTemplate(struct Line 2078  struct singleEntry * findTemplate(struct
2078      struct singleEntry * entry, * entry2;      struct singleEntry * entry, * entry2;
2079      int index;      int index;
2080    
2081      if (cfg->defaultImage > -1) {      if (cfg->cfi->defaultIsSaved) {
2082     if (cfg->cfi->getEnv) {
2083        char *defTitle = cfg->cfi->getEnv(cfg->cfi, "saved_entry");
2084        if (defTitle) {
2085     int index = 0;
2086     if (isnumber(defTitle)) {
2087        index = atoi(defTitle);
2088        entry = findEntryByIndex(cfg, index);
2089     } else {
2090        entry = findEntryByTitle(cfg, defTitle, &index);
2091     }
2092     if (entry)
2093        cfg->defaultImage = index;
2094        }
2095     }
2096        } else if (cfg->defaultImage > -1) {
2097   entry = findEntryByIndex(cfg, cfg->defaultImage);   entry = findEntryByIndex(cfg, cfg->defaultImage);
2098   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
2099      if (indexPtr) *indexPtr = cfg->defaultImage;      if (indexPtr) *indexPtr = cfg->defaultImage;
# Line 1767  void markRemovedImage(struct grubConfig Line 2146  void markRemovedImage(struct grubConfig
2146        const char * prefix) {        const char * prefix) {
2147      struct singleEntry * entry;      struct singleEntry * entry;
2148    
2149      if (!image) return;      if (!image)
2150     return;
2151    
2152        /* check and see if we're removing the default image */
2153        if (isdigit(*image)) {
2154     entry = findEntryByPath(cfg, image, prefix, NULL);
2155     if(entry)
2156        entry->skip = 1;
2157     return;
2158        }
2159    
2160      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))
2161   entry->skip = 1;   entry->skip = 1;
# Line 1775  void markRemovedImage(struct grubConfig Line 2163  void markRemovedImage(struct grubConfig
2163    
2164  void setDefaultImage(struct grubConfig * config, int hasNew,  void setDefaultImage(struct grubConfig * config, int hasNew,
2165       const char * defaultKernelPath, int newIsDefault,       const char * defaultKernelPath, int newIsDefault,
2166       const char * prefix, int flags) {       const char * prefix, int flags, int index) {
2167      struct singleEntry * entry, * entry2, * newDefault;      struct singleEntry * entry, * entry2, * newDefault;
2168      int i, j;      int i, j;
2169    
2170      if (newIsDefault) {      if (newIsDefault) {
2171   config->defaultImage = 0;   config->defaultImage = 0;
2172   return;   return;
2173        } else if ((index >= 0) && config->cfi->defaultIsIndex) {
2174     if (findEntryByIndex(config, index))
2175        config->defaultImage = index;
2176     else
2177        config->defaultImage = -1;
2178     return;
2179      } else if (defaultKernelPath) {      } else if (defaultKernelPath) {
2180   i = 0;   i = 0;
2181   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {
# Line 1856  void displayEntry(struct singleEntry * e Line 2250  void displayEntry(struct singleEntry * e
2250    
2251      printf("index=%d\n", index);      printf("index=%d\n", index);
2252    
2253      line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);      line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
2254      if (!line) {      if (!line) {
2255          printf("non linux entry\n");          printf("non linux entry\n");
2256          return;          return;
2257      }      }
2258    
2259      printf("kernel=%s%s\n", prefix, line->elements[1].item);      if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
2260     printf("kernel=%s\n", line->elements[1].item);
2261        else
2262     printf("kernel=%s%s\n", prefix, line->elements[1].item);
2263    
2264      if (line->numElements >= 3) {      if (line->numElements >= 3) {
2265   printf("args=\"");   printf("args=\"");
# Line 1918  void displayEntry(struct singleEntry * e Line 2315  void displayEntry(struct singleEntry * e
2315   printf("root=%s\n", s);   printf("root=%s\n", s);
2316      }      }
2317    
2318      line = getLineByType(LT_INITRD, entry->lines);      line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);
2319    
2320      if (line && line->numElements >= 2) {      if (line && line->numElements >= 2) {
2321   printf("initrd=%s", prefix);   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
2322        printf("initrd=");
2323     else
2324        printf("initrd=%s", prefix);
2325    
2326   for (i = 1; i < line->numElements; i++)   for (i = 1; i < line->numElements; i++)
2327      printf("%s%s", line->elements[i].item, line->elements[i].indent);      printf("%s%s", line->elements[i].item, line->elements[i].indent);
2328   printf("\n");   printf("\n");
2329      }      }
2330    
2331        line = getLineByType(LT_TITLE, entry->lines);
2332        if (line) {
2333     printf("title=%s\n", line->elements[1].item);
2334        } else {
2335     char * title;
2336     line = getLineByType(LT_MENUENTRY, entry->lines);
2337     title = grub2ExtractTitle(line);
2338     if (title)
2339        printf("title=%s\n", title);
2340        }
2341    }
2342    
2343    int isSuseSystem(void) {
2344        const char * path;
2345        const static char default_path[] = "/etc/SuSE-release";
2346    
2347        if ((path = getenv("GRUBBY_SUSE_RELEASE")) == NULL)
2348     path = default_path;
2349    
2350        if (!access(path, R_OK))
2351     return 1;
2352        return 0;
2353    }
2354    
2355    int isSuseGrubConf(const char * path) {
2356        FILE * grubConf;
2357        char * line = NULL;
2358        size_t len = 0, res = 0;
2359    
2360        grubConf = fopen(path, "r");
2361        if (!grubConf) {
2362            dbgPrintf("Could not open SuSE configuration file '%s'\n", path);
2363     return 0;
2364        }
2365    
2366        while ((res = getline(&line, &len, grubConf)) != -1) {
2367     if (!strncmp(line, "setup", 5)) {
2368        fclose(grubConf);
2369        free(line);
2370        return 1;
2371     }
2372        }
2373    
2374        dbgPrintf("SuSE configuration file '%s' does not appear to be valid\n",
2375          path);
2376    
2377        fclose(grubConf);
2378        free(line);
2379        return 0;
2380    }
2381    
2382    int suseGrubConfGetLba(const char * path, int * lbaPtr) {
2383        FILE * grubConf;
2384        char * line = NULL;
2385        size_t res = 0, len = 0;
2386    
2387        if (!path) return 1;
2388        if (!lbaPtr) return 1;
2389    
2390        grubConf = fopen(path, "r");
2391        if (!grubConf) return 1;
2392    
2393        while ((res = getline(&line, &len, grubConf)) != -1) {
2394     if (line[res - 1] == '\n')
2395        line[res - 1] = '\0';
2396     else if (len > res)
2397        line[res] = '\0';
2398     else {
2399        line = realloc(line, res + 1);
2400        line[res] = '\0';
2401     }
2402    
2403     if (!strncmp(line, "setup", 5)) {
2404        if (strstr(line, "--force-lba")) {
2405            *lbaPtr = 1;
2406        } else {
2407            *lbaPtr = 0;
2408        }
2409        dbgPrintf("lba: %i\n", *lbaPtr);
2410        break;
2411     }
2412        }
2413    
2414        free(line);
2415        fclose(grubConf);
2416        return 0;
2417    }
2418    
2419    int suseGrubConfGetInstallDevice(const char * path, char ** devicePtr) {
2420        FILE * grubConf;
2421        char * line = NULL;
2422        size_t res = 0, len = 0;
2423        char * lastParamPtr = NULL;
2424        char * secLastParamPtr = NULL;
2425        char installDeviceNumber = '\0';
2426        char * bounds = NULL;
2427    
2428        if (!path) return 1;
2429        if (!devicePtr) return 1;
2430    
2431        grubConf = fopen(path, "r");
2432        if (!grubConf) return 1;
2433    
2434        while ((res = getline(&line, &len, grubConf)) != -1) {
2435     if (strncmp(line, "setup", 5))
2436        continue;
2437    
2438     if (line[res - 1] == '\n')
2439        line[res - 1] = '\0';
2440     else if (len > res)
2441        line[res] = '\0';
2442     else {
2443        line = realloc(line, res + 1);
2444        line[res] = '\0';
2445     }
2446    
2447     lastParamPtr = bounds = line + res;
2448    
2449     /* Last parameter in grub may be an optional IMAGE_DEVICE */
2450     while (!isspace(*lastParamPtr))
2451        lastParamPtr--;
2452     lastParamPtr++;
2453    
2454     secLastParamPtr = lastParamPtr - 2;
2455     dbgPrintf("lastParamPtr: %s\n", lastParamPtr);
2456    
2457     if (lastParamPtr + 3 > bounds) {
2458        dbgPrintf("lastParamPtr going over boundary");
2459        fclose(grubConf);
2460        free(line);
2461        return 1;
2462     }
2463     if (!strncmp(lastParamPtr, "(hd", 3))
2464        lastParamPtr += 3;
2465     dbgPrintf("lastParamPtr: %c\n", *lastParamPtr);
2466    
2467     /*
2468     * Second last parameter will decide wether last parameter is
2469     * an IMAGE_DEVICE or INSTALL_DEVICE
2470     */
2471     while (!isspace(*secLastParamPtr))
2472        secLastParamPtr--;
2473     secLastParamPtr++;
2474    
2475     if (secLastParamPtr + 3 > bounds) {
2476        dbgPrintf("secLastParamPtr going over boundary");
2477        fclose(grubConf);
2478        free(line);
2479        return 1;
2480     }
2481     dbgPrintf("secLastParamPtr: %s\n", secLastParamPtr);
2482     if (!strncmp(secLastParamPtr, "(hd", 3)) {
2483        secLastParamPtr += 3;
2484        dbgPrintf("secLastParamPtr: %c\n", *secLastParamPtr);
2485        installDeviceNumber = *secLastParamPtr;
2486     } else {
2487        installDeviceNumber = *lastParamPtr;
2488     }
2489    
2490     *devicePtr = malloc(6);
2491     snprintf(*devicePtr, 6, "(hd%c)", installDeviceNumber);
2492     dbgPrintf("installDeviceNumber: %c\n", installDeviceNumber);
2493     fclose(grubConf);
2494     free(line);
2495     return 0;
2496        }
2497    
2498        free(line);
2499        fclose(grubConf);
2500        return 1;
2501    }
2502    
2503    int grubGetBootFromDeviceMap(const char * device,
2504         char ** bootPtr) {
2505        FILE * deviceMap;
2506        char * line = NULL;
2507        size_t res = 0, len = 0;
2508        char * devicePtr;
2509        char * bounds = NULL;
2510        const char * path;
2511        const static char default_path[] = "/boot/grub/device.map";
2512    
2513        if (!device) return 1;
2514        if (!bootPtr) return 1;
2515    
2516        if ((path = getenv("GRUBBY_GRUB_DEVICE_MAP")) == NULL)
2517     path = default_path;
2518    
2519        dbgPrintf("opening grub device.map file from: %s\n", path);
2520        deviceMap = fopen(path, "r");
2521        if (!deviceMap)
2522     return 1;
2523    
2524        while ((res = getline(&line, &len, deviceMap)) != -1) {
2525            if (!strncmp(line, "#", 1))
2526        continue;
2527    
2528     if (line[res - 1] == '\n')
2529        line[res - 1] = '\0';
2530     else if (len > res)
2531        line[res] = '\0';
2532     else {
2533        line = realloc(line, res + 1);
2534        line[res] = '\0';
2535     }
2536    
2537     devicePtr = line;
2538     bounds = line + res;
2539    
2540     while ((isspace(*line) && ((devicePtr + 1) <= bounds)))
2541        devicePtr++;
2542     dbgPrintf("device: %s\n", devicePtr);
2543    
2544     if (!strncmp(devicePtr, device, strlen(device))) {
2545        devicePtr += strlen(device);
2546        while (isspace(*devicePtr) && ((devicePtr + 1) <= bounds))
2547            devicePtr++;
2548    
2549        *bootPtr = strdup(devicePtr);
2550        break;
2551     }
2552        }
2553    
2554        free(line);
2555        fclose(deviceMap);
2556        return 0;
2557    }
2558    
2559    int suseGrubConfGetBoot(const char * path, char ** bootPtr) {
2560        char * grubDevice;
2561    
2562        if (suseGrubConfGetInstallDevice(path, &grubDevice))
2563     dbgPrintf("error looking for grub installation device\n");
2564        else
2565     dbgPrintf("grubby installation device: %s\n", grubDevice);
2566    
2567        if (grubGetBootFromDeviceMap(grubDevice, bootPtr))
2568     dbgPrintf("error looking for grub boot device\n");
2569        else
2570     dbgPrintf("grubby boot device: %s\n", *bootPtr);
2571    
2572        free(grubDevice);
2573        return 0;
2574    }
2575    
2576    int parseSuseGrubConf(int * lbaPtr, char ** bootPtr) {
2577        /*
2578         * This SuSE grub configuration file at this location is not your average
2579         * grub configuration file, but instead the grub commands used to setup
2580         * grub on that system.
2581         */
2582        const char * path;
2583        const static char default_path[] = "/etc/grub.conf";
2584    
2585        if ((path = getenv("GRUBBY_SUSE_GRUB_CONF")) == NULL)
2586     path = default_path;
2587    
2588        if (!isSuseGrubConf(path)) return 1;
2589    
2590        if (lbaPtr) {
2591            *lbaPtr = 0;
2592            if (suseGrubConfGetLba(path, lbaPtr))
2593                return 1;
2594        }
2595    
2596        if (bootPtr) {
2597            *bootPtr = NULL;
2598            suseGrubConfGetBoot(path, bootPtr);
2599        }
2600    
2601        return 0;
2602  }  }
2603    
2604  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {
# Line 1976  int parseSysconfigGrub(int * lbaPtr, cha Line 2649  int parseSysconfigGrub(int * lbaPtr, cha
2649  }  }
2650    
2651  void dumpSysconfigGrub(void) {  void dumpSysconfigGrub(void) {
2652      char * boot;      char * boot = NULL;
2653      int lba;      int lba;
2654    
2655      if (!parseSysconfigGrub(&lba, &boot)) {      if (isSuseSystem()) {
2656   if (lba) printf("lba\n");          if (parseSuseGrubConf(&lba, &boot)) {
2657   if (boot) printf("boot=%s\n", boot);      free(boot);
2658        return;
2659     }
2660        } else {
2661            if (parseSysconfigGrub(&lba, &boot)) {
2662        free(boot);
2663        return;
2664     }
2665        }
2666    
2667        if (lba) printf("lba\n");
2668        if (boot) {
2669     printf("boot=%s\n", boot);
2670     free(boot);
2671      }      }
2672  }  }
2673    
# Line 2030  struct singleLine * addLineTmpl(struct s Line 2716  struct singleLine * addLineTmpl(struct s
2716  {  {
2717      struct singleLine * newLine = lineDup(tmplLine);      struct singleLine * newLine = lineDup(tmplLine);
2718    
2719        if (isEfi && cfi == &grub2ConfigType) {
2720     enum lineType_e old = newLine->type;
2721     newLine->type = preferredLineType(newLine->type, cfi);
2722     if (old != newLine->type)
2723        newLine->elements[0].item = getKeyByType(newLine->type, cfi);
2724        }
2725    
2726      if (val) {      if (val) {
2727   /* override the inherited value with our own.   /* override the inherited value with our own.
2728   * This is a little weak because it only applies to elements[1]   * This is a little weak because it only applies to elements[1]
# Line 2039  struct singleLine * addLineTmpl(struct s Line 2732  struct singleLine * addLineTmpl(struct s
2732   insertElement(newLine, val, 1, cfi);   insertElement(newLine, val, 1, cfi);
2733    
2734   /* but try to keep the rootspec from the template... sigh */   /* but try to keep the rootspec from the template... sigh */
2735   if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD)) {   if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD|LT_KERNEL_EFI|LT_INITRD_EFI)) {
2736      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);
2737      if (rootspec != NULL) {      if (rootspec != NULL) {
2738   free(newLine->elements[1].item);   free(newLine->elements[1].item);
# Line 2076  struct singleLine *  addLine(struct sing Line 2769  struct singleLine *  addLine(struct sing
2769      /* NB: This function shouldn't allocate items on the heap, rather on the      /* NB: This function shouldn't allocate items on the heap, rather on the
2770       * stack since it calls addLineTmpl which will make copies.       * stack since it calls addLineTmpl which will make copies.
2771       */       */
   
2772      if (type == LT_TITLE && cfi->titleBracketed) {      if (type == LT_TITLE && cfi->titleBracketed) {
2773   /* we're doing a bracketed title (zipl) */   /* we're doing a bracketed title (zipl) */
2774   tmpl.type = type;   tmpl.type = type;
# Line 2180  void removeLine(struct singleEntry * ent Line 2872  void removeLine(struct singleEntry * ent
2872      free(line);      free(line);
2873  }  }
2874    
 static int isquote(char q)  
 {  
     if (q == '\'' || q == '\"')  
  return 1;  
     return 0;  
 }  
   
2875  static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)  static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)
2876  {  {
2877      struct singleLine newLine = {      struct singleLine newLine = {
# Line 2417  int updateActualImage(struct grubConfig Line 3102  int updateActualImage(struct grubConfig
3102      firstElement = 2;      firstElement = 2;
3103    
3104   } else {   } else {
3105      line = getLineByType(LT_KERNEL|LT_MBMODULE, entry->lines);      line = getLineByType(LT_KERNEL|LT_MBMODULE|LT_KERNEL_EFI, entry->lines);
3106      if (!line) {      if (!line) {
3107   /* no LT_KERNEL or LT_MBMODULE in this entry? */   /* no LT_KERNEL or LT_MBMODULE in this entry? */
3108   continue;   continue;
# Line 2573  int updateImage(struct grubConfig * cfg, Line 3258  int updateImage(struct grubConfig * cfg,
3258      return rc;      return rc;
3259  }  }
3260    
3261    int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
3262     const char * image, const char * prefix, const char * initrd) {
3263        struct singleEntry * entry;
3264        struct singleLine * line, * kernelLine, *endLine = NULL;
3265        int index = 0;
3266    
3267        if (!image) return 0;
3268    
3269        for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {
3270            kernelLine = getLineByType(LT_MBMODULE, entry->lines);
3271            if (!kernelLine) continue;
3272    
3273            if (prefix) {
3274                int prefixLen = strlen(prefix);
3275                if (!strncmp(initrd, prefix, prefixLen))
3276                    initrd += prefixLen;
3277            }
3278     endLine = getLineByType(LT_ENTRY_END, entry->lines);
3279     if (endLine)
3280        removeLine(entry, endLine);
3281            line = addLine(entry, cfg->cfi, preferredLineType(LT_MBMODULE,cfg->cfi),
3282     kernelLine->indent, initrd);
3283            if (!line)
3284        return 1;
3285     if (endLine) {
3286        line = addLine(entry, cfg->cfi, LT_ENTRY_END, "", NULL);
3287                if (!line)
3288     return 1;
3289     }
3290    
3291            break;
3292        }
3293    
3294        return 0;
3295    }
3296    
3297  int updateInitrd(struct grubConfig * cfg, const char * image,  int updateInitrd(struct grubConfig * cfg, const char * image,
3298                   const char * prefix, const char * initrd) {                   const char * prefix, const char * initrd) {
3299      struct singleEntry * entry;      struct singleEntry * entry;
# Line 2582  int updateInitrd(struct grubConfig * cfg Line 3303  int updateInitrd(struct grubConfig * cfg
3303      if (!image) return 0;      if (!image) return 0;
3304    
3305      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
3306          kernelLine = getLineByType(LT_KERNEL, entry->lines);          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI, entry->lines);
3307          if (!kernelLine) continue;          if (!kernelLine) continue;
3308    
3309          line = getLineByType(LT_INITRD, entry->lines);          line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);
3310          if (line)          if (line)
3311              removeLine(entry, line);              removeLine(entry, line);
3312          if (prefix) {          if (prefix) {
# Line 2596  int updateInitrd(struct grubConfig * cfg Line 3317  int updateInitrd(struct grubConfig * cfg
3317   endLine = getLineByType(LT_ENTRY_END, entry->lines);   endLine = getLineByType(LT_ENTRY_END, entry->lines);
3318   if (endLine)   if (endLine)
3319      removeLine(entry, endLine);      removeLine(entry, endLine);
3320          line = addLine(entry, cfg->cfi, LT_INITRD, kernelLine->indent, initrd);          line = addLine(entry, cfg->cfi, preferredLineType(LT_INITRD, cfg->cfi),
3321     kernelLine->indent, initrd);
3322          if (!line)          if (!line)
3323      return 1;      return 1;
3324   if (endLine) {   if (endLine) {
# Line 2802  int checkForGrub(struct grubConfig * con Line 3524  int checkForGrub(struct grubConfig * con
3524      int fd;      int fd;
3525      unsigned char bootSect[512];      unsigned char bootSect[512];
3526      char * boot;      char * boot;
3527        int onSuse = isSuseSystem();
3528    
3529      if (parseSysconfigGrub(NULL, &boot))  
3530   return 0;      if (onSuse) {
3531     if (parseSuseGrubConf(NULL, &boot))
3532        return 0;
3533        } else {
3534     if (parseSysconfigGrub(NULL, &boot))
3535        return 0;
3536        }
3537    
3538      /* assume grub is not installed -- not an error condition */      /* assume grub is not installed -- not an error condition */
3539      if (!boot)      if (!boot)
# Line 2823  int checkForGrub(struct grubConfig * con Line 3552  int checkForGrub(struct grubConfig * con
3552      }      }
3553      close(fd);      close(fd);
3554    
3555        /* The more elaborate checks do not work on SuSE. The checks done
3556         * seem to be reasonble (at least for now), so just return success
3557         */
3558        if (onSuse)
3559     return 2;
3560    
3561      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
3562  }  }
3563    
# Line 2856  int checkForExtLinux(struct grubConfig * Line 3591  int checkForExtLinux(struct grubConfig *
3591      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
3592  }  }
3593    
3594    int checkForYaboot(struct grubConfig * config) {
3595        /*
3596         * This is a simplistic check that we consider good enough for own puporses
3597         *
3598         * If we were to properly check if yaboot is *installed* we'd need to:
3599         * 1) get the system boot device (LT_BOOT)
3600         * 2) considering it's a raw filesystem, check if the yaboot binary matches
3601         *    the content on the boot device
3602         * 3) if not, copy the binary to a temporary file and run "addnote" on it
3603         * 4) check again if binary and boot device contents match
3604         */
3605        if (!access("/etc/yaboot.conf", R_OK))
3606     return 2;
3607    
3608        return 1;
3609    }
3610    
3611    int checkForElilo(struct grubConfig * config) {
3612        if (!access("/etc/elilo.conf", R_OK))
3613     return 2;
3614    
3615        return 1;
3616    }
3617    
3618  static char * getRootSpecifier(char * str) {  static char * getRootSpecifier(char * str) {
3619      char * idx, * rootspec = NULL;      char * idx, * rootspec = NULL;
3620    
# Line 2870  static char * getRootSpecifier(char * st Line 3629  static char * getRootSpecifier(char * st
3629  static char * getInitrdVal(struct grubConfig * config,  static char * getInitrdVal(struct grubConfig * config,
3630     const char * prefix, struct singleLine *tmplLine,     const char * prefix, struct singleLine *tmplLine,
3631     const char * newKernelInitrd,     const char * newKernelInitrd,
3632     char ** extraInitrds, int extraInitrdCount)     const char ** extraInitrds, int extraInitrdCount)
3633  {  {
3634      char *initrdVal, *end;      char *initrdVal, *end;
3635      int i;      int i;
# Line 2915  static char * getInitrdVal(struct grubCo Line 3674  static char * getInitrdVal(struct grubCo
3674    
3675  int addNewKernel(struct grubConfig * config, struct singleEntry * template,  int addNewKernel(struct grubConfig * config, struct singleEntry * template,
3676           const char * prefix,           const char * prefix,
3677   char * newKernelPath, char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
3678   char * newKernelArgs, char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
3679   char ** extraInitrds, int extraInitrdCount,   const char ** extraInitrds, int extraInitrdCount,
3680                   char * newMBKernel, char * newMBKernelArgs) {                   const char * newMBKernel, const char * newMBKernelArgs) {
3681      struct singleEntry * new;      struct singleEntry * new;
3682      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
3683      int needs;      int needs;
# Line 2972  int addNewKernel(struct grubConfig * con Line 3731  int addNewKernel(struct grubConfig * con
3731      while (*chptr && isspace(*chptr)) chptr++;      while (*chptr && isspace(*chptr)) chptr++;
3732      if (*chptr == '#') continue;      if (*chptr == '#') continue;
3733    
3734      if (tmplLine->type == LT_KERNEL &&      if (iskernel(tmplLine->type) && tmplLine->numElements >= 2) {
     tmplLine->numElements >= 2) {  
3735   if (!template->multiboot && (needs & NEED_MB)) {   if (!template->multiboot && (needs & NEED_MB)) {
3736      /* it's not a multiboot template and this is the kernel      /* it's not a multiboot template and this is the kernel
3737       * line.  Try to be intelligent about inserting the       * line.  Try to be intelligent about inserting the
# Line 3050  int addNewKernel(struct grubConfig * con Line 3808  int addNewKernel(struct grubConfig * con
3808      /* template is multi but new is not,      /* template is multi but new is not,
3809       * insert the kernel in the first module slot       * insert the kernel in the first module slot
3810       */       */
3811      tmplLine->type = LT_KERNEL;      tmplLine->type = preferredLineType(LT_KERNEL, config->cfi);
3812      free(tmplLine->elements[0].item);      free(tmplLine->elements[0].item);
3813      tmplLine->elements[0].item =      tmplLine->elements[0].item =
3814   strdup(getKeywordByType(LT_KERNEL, config->cfi)->key);   strdup(getKeywordByType(tmplLine->type,
3815     config->cfi)->key);
3816      newLine = addLineTmpl(new, tmplLine, newLine,      newLine = addLineTmpl(new, tmplLine, newLine,
3817    newKernelPath + strlen(prefix), config->cfi);    newKernelPath + strlen(prefix),
3818      config->cfi);
3819      needs &= ~NEED_KERNEL;      needs &= ~NEED_KERNEL;
3820   } else if (needs & NEED_INITRD) {   } else if (needs & NEED_INITRD) {
3821      char *initrdVal;      char *initrdVal;
3822      /* template is multi but new is not,      /* template is multi but new is not,
3823       * insert the initrd in the second module slot       * insert the initrd in the second module slot
3824       */       */
3825      tmplLine->type = LT_INITRD;      tmplLine->type = preferredLineType(LT_INITRD, config->cfi);
3826      free(tmplLine->elements[0].item);      free(tmplLine->elements[0].item);
3827      tmplLine->elements[0].item =      tmplLine->elements[0].item =
3828   strdup(getKeywordByType(LT_INITRD, config->cfi)->key);   strdup(getKeywordByType(tmplLine->type,
3829     config->cfi)->key);
3830      initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);      initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);
3831      newLine = addLineTmpl(new, tmplLine, newLine, initrdVal, config->cfi);      newLine = addLineTmpl(new, tmplLine, newLine, initrdVal, config->cfi);
3832      free(initrdVal);      free(initrdVal);
3833      needs &= ~NEED_INITRD;      needs &= ~NEED_INITRD;
3834   }   }
3835    
3836      } else if (tmplLine->type == LT_INITRD &&      } else if (isinitrd(tmplLine->type) && tmplLine->numElements >= 2) {
        tmplLine->numElements >= 2) {  
3837   if (needs & NEED_INITRD &&   if (needs & NEED_INITRD &&
3838      new->multiboot && !template->multiboot &&      new->multiboot && !template->multiboot &&
3839      config->cfi->mbInitRdIsModule) {      config->cfi->mbInitRdIsModule) {
# Line 3127  int addNewKernel(struct grubConfig * con Line 3887  int addNewKernel(struct grubConfig * con
3887      static const char *prefix = "'Loading ";      static const char *prefix = "'Loading ";
3888      if (tmplLine->numElements > 1 &&      if (tmplLine->numElements > 1 &&
3889      strstr(tmplLine->elements[1].item, prefix) &&      strstr(tmplLine->elements[1].item, prefix) &&
3890      masterLine->next && masterLine->next->type == LT_KERNEL) {      masterLine->next &&
3891        iskernel(masterLine->next->type)) {
3892   char *newTitle = malloc(strlen(prefix) +   char *newTitle = malloc(strlen(prefix) +
3893   strlen(newKernelTitle) + 2);   strlen(newKernelTitle) + 2);
3894    
# Line 3154  int addNewKernel(struct grubConfig * con Line 3915  int addNewKernel(struct grubConfig * con
3915   */   */
3916   switch (config->cfi->entryStart) {   switch (config->cfi->entryStart) {
3917      case LT_KERNEL:      case LT_KERNEL:
3918        case LT_KERNEL_EFI:
3919   if (new->multiboot && config->cfi->mbHyperFirst) {   if (new->multiboot && config->cfi->mbHyperFirst) {
3920      /* fall through to LT_HYPER */      /* fall through to LT_HYPER */
3921   } else {   } else {
3922      newLine = addLine(new, config->cfi, LT_KERNEL,      newLine = addLine(new, config->cfi,
3923              preferredLineType(LT_KERNEL, config->cfi),
3924        config->primaryIndent,        config->primaryIndent,
3925        newKernelPath + strlen(prefix));        newKernelPath + strlen(prefix));
3926      needs &= ~NEED_KERNEL;      needs &= ~NEED_KERNEL;
# Line 3233  int addNewKernel(struct grubConfig * con Line 3996  int addNewKernel(struct grubConfig * con
3996      if (needs & NEED_KERNEL) {      if (needs & NEED_KERNEL) {
3997   newLine = addLine(new, config->cfi,   newLine = addLine(new, config->cfi,
3998    (new->multiboot && getKeywordByType(LT_MBMODULE,    (new->multiboot && getKeywordByType(LT_MBMODULE,
3999        config->cfi)) ?        config->cfi))
4000    LT_MBMODULE : LT_KERNEL,     ? LT_MBMODULE
4001     : preferredLineType(LT_KERNEL, config->cfi),
4002    config->secondaryIndent,    config->secondaryIndent,
4003    newKernelPath + strlen(prefix));    newKernelPath + strlen(prefix));
4004   needs &= ~NEED_KERNEL;   needs &= ~NEED_KERNEL;
# Line 3250  int addNewKernel(struct grubConfig * con Line 4014  int addNewKernel(struct grubConfig * con
4014   initrdVal = getInitrdVal(config, prefix, NULL, newKernelInitrd, extraInitrds, extraInitrdCount);   initrdVal = getInitrdVal(config, prefix, NULL, newKernelInitrd, extraInitrds, extraInitrdCount);
4015   newLine = addLine(new, config->cfi,   newLine = addLine(new, config->cfi,
4016    (new->multiboot && getKeywordByType(LT_MBMODULE,    (new->multiboot && getKeywordByType(LT_MBMODULE,
4017        config->cfi)) ?        config->cfi))
4018    LT_MBMODULE : LT_INITRD,     ? LT_MBMODULE
4019       : preferredLineType(LT_INITRD, config->cfi),
4020    config->secondaryIndent,    config->secondaryIndent,
4021    initrdVal);    initrdVal);
4022   free(initrdVal);   free(initrdVal);
# Line 3283  static void traceback(int signum) Line 4048  static void traceback(int signum)
4048      memset(array, '\0', sizeof (array));      memset(array, '\0', sizeof (array));
4049      size = backtrace(array, 40);      size = backtrace(array, 40);
4050    
4051      fprintf(stderr, "grubby recieved SIGSEGV!  Backtrace (%ld):\n",      fprintf(stderr, "grubby received SIGSEGV!  Backtrace (%ld):\n",
4052              (unsigned long)size);              (unsigned long)size);
4053      backtrace_symbols_fd(array, size, STDERR_FILENO);      backtrace_symbols_fd(array, size, STDERR_FILENO);
4054      exit(1);      exit(1);
# Line 3318  int main(int argc, const char ** argv) { Line 4083  int main(int argc, const char ** argv) {
4083      char * removeArgs = NULL;      char * removeArgs = NULL;
4084      char * kernelInfo = NULL;      char * kernelInfo = NULL;
4085      char * extraInitrds[MAX_EXTRA_INITRDS] = { NULL };      char * extraInitrds[MAX_EXTRA_INITRDS] = { NULL };
4086        char * envPath = NULL;
4087      const char * chptr = NULL;      const char * chptr = NULL;
4088      struct configFileInfo * cfi = NULL;      struct configFileInfo * cfi = NULL;
4089      struct grubConfig * config;      struct grubConfig * config;
# Line 3326  int main(int argc, const char ** argv) { Line 4092  int main(int argc, const char ** argv) {
4092      int displayDefault = 0;      int displayDefault = 0;
4093      int displayDefaultIndex = 0;      int displayDefaultIndex = 0;
4094      int displayDefaultTitle = 0;      int displayDefaultTitle = 0;
4095        int defaultIndex = -1;
4096      struct poptOption options[] = {      struct poptOption options[] = {
4097   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,
4098      _("add an entry for the specified kernel"), _("kernel-path") },      _("add an entry for the specified kernel"), _("kernel-path") },
# Line 3343  int main(int argc, const char ** argv) { Line 4110  int main(int argc, const char ** argv) {
4110   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
4111      _("filestystem which contains /boot directory (for testing only)"),      _("filestystem which contains /boot directory (for testing only)"),
4112      _("bootfs") },      _("bootfs") },
4113  #if defined(__i386__) || defined(__x86_64__)  #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
4114   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
4115      _("check if lilo is installed on lilo.conf boot sector") },      _("check which bootloader is installed on boot sector") },
4116  #endif  #endif
4117   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,
4118      _("path to grub config file to update (\"-\" for stdin)"),      _("path to grub config file to update (\"-\" for stdin)"),
# Line 3366  int main(int argc, const char ** argv) { Line 4133  int main(int argc, const char ** argv) {
4133      _("display the title of the default kernel") },      _("display the title of the default kernel") },
4134   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
4135      _("configure elilo bootloader") },      _("configure elilo bootloader") },
4136     { "efi", 0, POPT_ARG_NONE, &isEfi, 0,
4137        _("force grub2 stanzas to use efi") },
4138     { "env", 0, POPT_ARG_STRING, &envPath, 0,
4139        _("path for environment data"),
4140        _("path") },
4141   { "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,   { "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,
4142      _("configure extlinux bootloader (from syslinux)") },      _("configure extlinux bootloader (from syslinux)") },
4143   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,
# Line 3378  int main(int argc, const char ** argv) { Line 4150  int main(int argc, const char ** argv) {
4150   { "initrd", 0, POPT_ARG_STRING, &newKernelInitrd, 0,   { "initrd", 0, POPT_ARG_STRING, &newKernelInitrd, 0,
4151      _("initrd image for the new kernel"), _("initrd-path") },      _("initrd image for the new kernel"), _("initrd-path") },
4152   { "extra-initrd", 'i', POPT_ARG_STRING, NULL, 'i',   { "extra-initrd", 'i', POPT_ARG_STRING, NULL, 'i',
4153      _("auxilliary initrd image for things other than the new kernel"), _("initrd-path") },      _("auxiliary initrd image for things other than the new kernel"), _("initrd-path") },
4154   { "lilo", 0, POPT_ARG_NONE, &configureLilo, 0,   { "lilo", 0, POPT_ARG_NONE, &configureLilo, 0,
4155      _("configure lilo bootloader") },      _("configure lilo bootloader") },
4156   { "make-default", 0, 0, &makeDefault, 0,   { "make-default", 0, 0, &makeDefault, 0,
# Line 3398  int main(int argc, const char ** argv) { Line 4170  int main(int argc, const char ** argv) {
4170   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,
4171      _("make the first entry referencing the specified kernel "      _("make the first entry referencing the specified kernel "
4172        "the default"), _("kernel-path") },        "the default"), _("kernel-path") },
4173     { "set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,
4174        _("make the given entry index the default entry"),
4175        _("entry-index") },
4176   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,
4177      _("configure silo bootloader") },      _("configure silo bootloader") },
4178   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,
# Line 3419  int main(int argc, const char ** argv) { Line 4194  int main(int argc, const char ** argv) {
4194    
4195      signal(SIGSEGV, traceback);      signal(SIGSEGV, traceback);
4196    
4197        int i = 0;
4198        for (int j = 1; j < argc; j++)
4199     i += strlen(argv[j]) + 1;
4200        saved_command_line = malloc(i);
4201        if (!saved_command_line) {
4202     fprintf(stderr, "grubby: %m\n");
4203     exit(1);
4204        }
4205        saved_command_line[0] = '\0';
4206        for (int j = 1; j < argc; j++) {
4207     strcat(saved_command_line, argv[j]);
4208     strncat(saved_command_line, j == argc -1 ? "" : " ", 1);
4209        }
4210    
4211      optCon = poptGetContext("grubby", argc, argv, options, 0);      optCon = poptGetContext("grubby", argc, argv, options, 0);
4212      poptReadDefaultConfig(optCon, 1);      poptReadDefaultConfig(optCon, 1);
4213    
# Line 3462  int main(int argc, const char ** argv) { Line 4251  int main(int argc, const char ** argv) {
4251   return 1;   return 1;
4252      } else if (configureGrub2) {      } else if (configureGrub2) {
4253   cfi = &grub2ConfigType;   cfi = &grub2ConfigType;
4254     if (envPath)
4255        cfi->envFile = envPath;
4256      } else if (configureLilo) {      } else if (configureLilo) {
4257   cfi = &liloConfigType;   cfi = &liloConfigType;
4258      } else if (configureGrub) {      } else if (configureGrub) {
# Line 3480  int main(int argc, const char ** argv) { Line 4271  int main(int argc, const char ** argv) {
4271      }      }
4272    
4273      if (!cfi) {      if (!cfi) {
4274            if (grub2FindConfig(&grub2ConfigType))
4275        cfi = &grub2ConfigType;
4276     else
4277        #ifdef __ia64__        #ifdef __ia64__
4278   cfi = &eliloConfigType;      cfi = &eliloConfigType;
4279        #elif __powerpc__        #elif __powerpc__
4280   cfi = &yabootConfigType;      cfi = &yabootConfigType;
4281        #elif __sparc__        #elif __sparc__
4282          cfi = &siloConfigType;              cfi = &siloConfigType;
4283        #elif __s390__        #elif __s390__
4284          cfi = &ziplConfigType;              cfi = &ziplConfigType;
4285        #elif __s390x__        #elif __s390x__
4286          cfi = &ziplConfigtype;              cfi = &ziplConfigtype;
4287        #else        #else
         if (grub2FindConfig(&grub2ConfigType))  
     cfi = &grub2ConfigType;  
  else  
4288      cfi = &grubConfigType;      cfi = &grubConfigType;
4289        #endif        #endif
4290      }      }
# Line 3506  int main(int argc, const char ** argv) { Line 4297  int main(int argc, const char ** argv) {
4297      }      }
4298    
4299      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||
4300    newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
4301    defaultKernel || displayDefaultIndex || displayDefaultTitle)) {      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
4302        (defaultIndex >= 0))) {
4303   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
4304    "specified option"));    "specified option"));
4305   return 1;   return 1;
# Line 3549  int main(int argc, const char ** argv) { Line 4341  int main(int argc, const char ** argv) {
4341   makeDefault = 1;   makeDefault = 1;
4342   defaultKernel = NULL;   defaultKernel = NULL;
4343      }      }
4344        else if (defaultKernel && (defaultIndex >= 0)) {
4345     fprintf(stderr, _("grubby: --set-default and --set-default-index "
4346      "may not be used together\n"));
4347     return 1;
4348        }
4349    
4350      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {
4351   fprintf(stderr, _("grubby: output file must be specified if stdin "   fprintf(stderr, _("grubby: output file must be specified if stdin "
# Line 3557  int main(int argc, const char ** argv) { Line 4354  int main(int argc, const char ** argv) {
4354      }      }
4355    
4356      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
4357   && !kernelInfo && !bootloaderProbe && !updateKernelPath   && !kernelInfo && !bootloaderProbe && !updateKernelPath
4358          && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle) {   && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle
4359     && (defaultIndex == -1)) {
4360   fprintf(stderr, _("grubby: no action specified\n"));   fprintf(stderr, _("grubby: no action specified\n"));
4361   return 1;   return 1;
4362      }      }
# Line 3585  int main(int argc, const char ** argv) { Line 4383  int main(int argc, const char ** argv) {
4383      }      }
4384    
4385      if (bootloaderProbe) {      if (bootloaderProbe) {
4386   int lrc = 0, grc = 0, gr2c = 0, erc = 0;   int lrc = 0, grc = 0, gr2c = 0, extrc = 0, yrc = 0, erc = 0;
4387   struct grubConfig * lconfig, * gconfig;   struct grubConfig * lconfig, * gconfig, * yconfig, * econfig;
4388    
4389   const char *grub2config = grub2FindConfig(&grub2ConfigType);   const char *grub2config = grub2FindConfig(&grub2ConfigType);
4390   if (grub2config) {   if (grub2config) {
# Line 3614  int main(int argc, const char ** argv) { Line 4412  int main(int argc, const char ** argv) {
4412   lrc = checkForLilo(lconfig);   lrc = checkForLilo(lconfig);
4413   }   }
4414    
4415     if (!access(eliloConfigType.defaultConfig, F_OK)) {
4416        econfig = readConfig(eliloConfigType.defaultConfig,
4417     &eliloConfigType);
4418        if (!econfig)
4419     erc = 1;
4420        else
4421     erc = checkForElilo(econfig);
4422     }
4423    
4424   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {
4425      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);
4426      if (!lconfig)      if (!lconfig)
4427   erc = 1;   extrc = 1;
4428      else      else
4429   erc = checkForExtLinux(lconfig);   extrc = checkForExtLinux(lconfig);
4430   }   }
4431    
4432   if (lrc == 1 || grc == 1 || gr2c == 1) return 1;  
4433     if (!access(yabootConfigType.defaultConfig, F_OK)) {
4434        yconfig = readConfig(yabootConfigType.defaultConfig,
4435     &yabootConfigType);
4436        if (!yconfig)
4437     yrc = 1;
4438        else
4439     yrc = checkForYaboot(yconfig);
4440     }
4441    
4442     if (lrc == 1 || grc == 1 || gr2c == 1 || extrc == 1 || yrc == 1 ||
4443     erc == 1)
4444        return 1;
4445    
4446   if (lrc == 2) printf("lilo\n");   if (lrc == 2) printf("lilo\n");
4447   if (gr2c == 2) printf("grub2\n");   if (gr2c == 2) printf("grub2\n");
4448   if (grc == 2) printf("grub\n");   if (grc == 2) printf("grub\n");
4449   if (erc == 2) printf("extlinux\n");   if (extrc == 2) printf("extlinux\n");
4450     if (yrc == 2) printf("yaboot\n");
4451     if (erc == 2) printf("elilo\n");
4452    
4453   return 0;   return 0;
4454      }      }
4455    
4456        if (grubConfig == NULL) {
4457     printf("Could not find bootloader configuration file.\n");
4458     exit(1);
4459        }
4460    
4461      config = readConfig(grubConfig, cfi);      config = readConfig(grubConfig, cfi);
4462      if (!config) return 1;      if (!config) return 1;
4463    
# Line 3641  int main(int argc, const char ** argv) { Line 4467  int main(int argc, const char ** argv) {
4467          char * rootspec;          char * rootspec;
4468    
4469   if (config->defaultImage == -1) return 0;   if (config->defaultImage == -1) return 0;
4470     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
4471     cfi->defaultIsSaved)
4472        config->defaultImage = 0;
4473   entry = findEntryByIndex(config, config->defaultImage);   entry = findEntryByIndex(config, config->defaultImage);
4474   if (!entry) return 0;   if (!entry) return 0;
4475   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
4476    
4477   line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
4478   if (!line) return 0;   if (!line) return 0;
4479    
4480          rootspec = getRootSpecifier(line->elements[1].item);          rootspec = getRootSpecifier(line->elements[1].item);
# Line 3659  int main(int argc, const char ** argv) { Line 4488  int main(int argc, const char ** argv) {
4488   struct singleEntry * entry;   struct singleEntry * entry;
4489    
4490   if (config->defaultImage == -1) return 0;   if (config->defaultImage == -1) return 0;
4491     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
4492     cfi->defaultIsSaved)
4493        config->defaultImage = 0;
4494   entry = findEntryByIndex(config, config->defaultImage);   entry = findEntryByIndex(config, config->defaultImage);
4495   if (!entry) return 0;   if (!entry) return 0;
4496    
# Line 3681  int main(int argc, const char ** argv) { Line 4513  int main(int argc, const char ** argv) {
4513    
4514      } else if (displayDefaultIndex) {      } else if (displayDefaultIndex) {
4515          if (config->defaultImage == -1) return 0;          if (config->defaultImage == -1) return 0;
4516     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
4517     cfi->defaultIsSaved)
4518        config->defaultImage = 0;
4519          printf("%i\n", config->defaultImage);          printf("%i\n", config->defaultImage);
4520            return 0;
4521    
4522      } else if (kernelInfo)      } else if (kernelInfo)
4523   return displayInfo(config, kernelInfo, bootPrefix);   return displayInfo(config, kernelInfo, bootPrefix);
# Line 3694  int main(int argc, const char ** argv) { Line 4530  int main(int argc, const char ** argv) {
4530      markRemovedImage(config, removeKernelPath, bootPrefix);      markRemovedImage(config, removeKernelPath, bootPrefix);
4531      markRemovedImage(config, removeMBKernel, bootPrefix);      markRemovedImage(config, removeMBKernel, bootPrefix);
4532      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,
4533      bootPrefix, flags);      bootPrefix, flags, defaultIndex);
4534      setFallbackImage(config, newKernelPath != NULL);      setFallbackImage(config, newKernelPath != NULL);
4535      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
4536                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
4537      if (updateKernelPath && newKernelInitrd) {      if (updateKernelPath && newKernelInitrd) {
4538              if (updateInitrd(config, updateKernelPath, bootPrefix,      if (newMBKernel) {
4539                               newKernelInitrd)) return 1;      if (addMBInitrd(config, newMBKernel, updateKernelPath,
4540     bootPrefix, newKernelInitrd))
4541        return 1;
4542        } else {
4543        if (updateInitrd(config, updateKernelPath, bootPrefix,
4544     newKernelInitrd))
4545     return 1;
4546        }
4547      }      }
4548      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
4549                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
4550                       extraInitrds, extraInitrdCount,                       (const char **)extraInitrds, extraInitrdCount,
4551                       newMBKernel, newMBKernelArgs)) return 1;                       newMBKernel, newMBKernelArgs)) return 1;
4552            
4553    

Legend:
Removed from v.1748  
changed lines
  Added in v.2682