Magellan Linux

  • Back to homepage
    • /[magellan-source]/tags/grubby-8_32/grubby.c

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

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

    revision 1746 by niro, Sat Feb 18 01:06:20 2012 UTC revision 2056 by niro, Wed Feb 20 14:04:28 2013 UTC
    # Line 56  int debug = 0; /* Currently just for tem Line 56  int debug = 0; /* Currently just for tem
    56  #define NOOP_OPCODE 0x90  #define NOOP_OPCODE 0x90
    57  #define JMP_SHORT_OPCODE 0xeb  #define JMP_SHORT_OPCODE 0xeb
    58    
    59    int isEfi = 0;
    60    
    61  /* comments get lumped in with indention */  /* comments get lumped in with indention */
    62  struct lineElement {  struct lineElement {
    63      char * item;      char * item;
    # Line 82  enum lineType_e { Line 84  enum lineType_e {
    84      LT_MENUENTRY    = 1 << 17,      LT_MENUENTRY    = 1 << 17,
    85      LT_ENTRY_END    = 1 << 18,      LT_ENTRY_END    = 1 << 18,
    86      LT_SET_VARIABLE = 1 << 19,      LT_SET_VARIABLE = 1 << 19,
    87      LT_UNKNOWN      = 1 << 20,      LT_KERNEL_EFI   = 1 << 20,
    88        LT_INITRD_EFI   = 1 << 21,
    89        LT_UNKNOWN      = 1 << 22,
    90  };  };
    91    
    92  struct singleLine {  struct singleLine {
    # Line 114  struct singleEntry { Line 118  struct singleEntry {
    118    
    119  #define MAIN_DEFAULT    (1 << 0)  #define MAIN_DEFAULT    (1 << 0)
    120  #define DEFAULT_SAVED       -2  #define DEFAULT_SAVED       -2
    121    #define DEFAULT_SAVED_GRUB2 -3
    122    
    123  struct keywordTypes {  struct keywordTypes {
    124      char * key;      char * key;
    # Line 133  struct configFileInfo { Line 138  struct configFileInfo {
    138      findConfigFunc findConfig;      findConfigFunc findConfig;
    139      writeLineFunc writeLine;      writeLineFunc writeLine;
    140      struct keywordTypes * keywords;      struct keywordTypes * keywords;
    141        int caseInsensitive;
    142      int defaultIsIndex;      int defaultIsIndex;
    143      int defaultIsVariable;      int defaultIsVariable;
    144      int defaultSupportSaved;      int defaultSupportSaved;
    # Line 163  struct keywordTypes grubKeywords[] = { Line 169  struct keywordTypes grubKeywords[] = {
    169    
    170  const char *grubFindConfig(struct configFileInfo *cfi) {  const char *grubFindConfig(struct configFileInfo *cfi) {
    171      static const char *configFiles[] = {      static const char *configFiles[] = {
      "/etc/grub.conf",  
    172   "/boot/grub/grub.conf",   "/boot/grub/grub.conf",
    173   "/boot/grub/menu.lst",   "/boot/grub/menu.lst",
    174     "/etc/grub.conf",
    175   NULL   NULL
    176      };      };
    177      static int i = -1;      static int i = -1;
    # Line 204  struct keywordTypes grub2Keywords[] = { Line 210  struct keywordTypes grub2Keywords[] = {
    210      { "default",    LT_DEFAULT,     ' ' },      { "default",    LT_DEFAULT,     ' ' },
    211      { "fallback",   LT_FALLBACK,    ' ' },      { "fallback",   LT_FALLBACK,    ' ' },
    212      { "linux",      LT_KERNEL,      ' ' },      { "linux",      LT_KERNEL,      ' ' },
    213        { "linuxefi",   LT_KERNEL_EFI,  ' ' },
    214      { "initrd",     LT_INITRD,      ' ', ' ' },      { "initrd",     LT_INITRD,      ' ', ' ' },
    215        { "initrdefi",  LT_INITRD_EFI,  ' ', ' ' },
    216      { "module",     LT_MBMODULE,    ' ' },      { "module",     LT_MBMODULE,    ' ' },
    217      { "kernel",     LT_HYPER,       ' ' },      { "kernel",     LT_HYPER,       ' ' },
    218      { NULL, 0, 0 },      { NULL, 0, 0 },
    # Line 242  const char *grub2FindConfig(struct confi Line 250  const char *grub2FindConfig(struct confi
    250  }  }
    251    
    252  int sizeOfSingleLine(struct singleLine * line) {  int sizeOfSingleLine(struct singleLine * line) {
       int i;  
    253    int count = 0;    int count = 0;
    254    
    255    for (i = 0; i < line->numElements; i++) {    for (int i = 0; i < line->numElements; i++) {
    256      int indentSize = 0;      int indentSize = 0;
    257    
    258      count = count + strlen(line->elements[i].item);      count = count + strlen(line->elements[i].item);
    # Line 264  int sizeOfSingleLine(struct singleLine * Line 271  int sizeOfSingleLine(struct singleLine *
    271    return count;    return count;
    272  }  }
    273    
    274    static int isquote(char q)
    275    {
    276        if (q == '\'' || q == '\"')
    277     return 1;
    278        return 0;
    279    }
    280    
    281    static int iskernel(enum lineType_e type) {
    282        return (type == LT_KERNEL || type == LT_KERNEL_EFI);
    283    }
    284    
    285    static int isinitrd(enum lineType_e type) {
    286        return (type == LT_INITRD || type == LT_INITRD_EFI);
    287    }
    288    
    289  char *grub2ExtractTitle(struct singleLine * line) {  char *grub2ExtractTitle(struct singleLine * line) {
    290      char * current;      char * current;
    291      char * current_indent;      char * current_indent;
    # Line 280  char *grub2ExtractTitle(struct singleLin Line 302  char *grub2ExtractTitle(struct singleLin
    302      current_len = strlen(current);      current_len = strlen(current);
    303    
    304      /* if second word is quoted, strip the quotes and return single word */      /* if second word is quoted, strip the quotes and return single word */
    305      if ((*current == '\'') && (*(current + current_len - 1) == '\'')) {      if (isquote(*current) && isquote(current[current_len - 1])) {
    306        char *tmp;   char *tmp;
    307    
    308        tmp = strdup(current);   tmp = strdup(current);
    309        *(tmp + current_len - 1) = '\0';   *(tmp + current_len - 1) = '\0';
    310        return ++tmp;   return ++tmp;
    311      }      }
    312    
    313      /* if no quotes, return second word verbatim */      /* if no quotes, return second word verbatim */
    314      if (*current != '\'') {      if (!isquote(*current))
    315        return current;   return current;
         }  
    316    
    317      /* 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
    318       * whose last character is also quote (assuming it's the closing one) */       * whose last character is also quote (assuming it's the closing one) */
    319      if (*current == '\'') {      int resultMaxSize;
    320        int resultMaxSize;      char * result;
    321        char * result;      
    322        resultMaxSize = sizeOfSingleLine(line);
    323        resultMaxSize = sizeOfSingleLine(line);      result = malloc(resultMaxSize);
    324        result = malloc(resultMaxSize);      snprintf(result, resultMaxSize, "%s", ++current);
    325        snprintf(result, resultMaxSize, "%s", ++current);      
    326        i++;
    327        i++;      for (; i < line->numElements; ++i) {
           for (; i < line->numElements; ++i) {  
    328   current = line->elements[i].item;   current = line->elements[i].item;
    329   current_len = strlen(current);   current_len = strlen(current);
    330   current_indent = line->elements[i].indent;   current_indent = line->elements[i].indent;
    331   current_indent_len = strlen(current_indent);   current_indent_len = strlen(current_indent);
    332    
    333   strncat(result, current_indent, current_indent_len);   strncat(result, current_indent, current_indent_len);
    334   if (*(current + current_len - 1) != '\'') {   if (!isquote(current[current_len-1])) {
    335    strncat(result, current, current_len);      strncat(result, current, current_len);
    336   } else {   } else {
    337    strncat(result, current, current_len - 1);      strncat(result, current, current_len - 1);
    338    break;      break;
    339   }   }
           }  
           return result;  
    340      }      }
    341        return result;
         return NULL;  
    342  }  }
    343    
    344  struct configFileInfo grub2ConfigType = {  struct configFileInfo grub2ConfigType = {
    345      .findConfig = grub2FindConfig,      .findConfig = grub2FindConfig,
    346      .keywords = grub2Keywords,      .keywords = grub2Keywords,
    347      .defaultIsIndex = 1,      .defaultIsIndex = 1,
    348      .defaultSupportSaved = 0,      .defaultSupportSaved = 1,
    349      .defaultIsVariable = 1,      .defaultIsVariable = 1,
    350      .entryStart = LT_MENUENTRY,      .entryStart = LT_MENUENTRY,
    351      .entryEnd = LT_ENTRY_END,      .entryEnd = LT_ENTRY_END,
    # Line 480  struct configFileInfo ziplConfigType = { Line 497  struct configFileInfo ziplConfigType = {
    497  struct configFileInfo extlinuxConfigType = {  struct configFileInfo extlinuxConfigType = {
    498      .defaultConfig = "/boot/extlinux/extlinux.conf",      .defaultConfig = "/boot/extlinux/extlinux.conf",
    499      .keywords = extlinuxKeywords,      .keywords = extlinuxKeywords,
    500        .caseInsensitive = 1,
    501      .entryStart = LT_TITLE,      .entryStart = LT_TITLE,
    502      .needsBootPrefix = 1,      .needsBootPrefix = 1,
    503      .maxTitleLength = 255,      .maxTitleLength = 255,
    # Line 568  static char * sdupprintf(const char *for Line 586  static char * sdupprintf(const char *for
    586      return buf;      return buf;
    587  }  }
    588    
    589    static enum lineType_e preferredLineType(enum lineType_e type,
    590     struct configFileInfo *cfi) {
    591        if (isEfi && cfi == &grub2ConfigType) {
    592     switch (type) {
    593     case LT_KERNEL:
    594        return LT_KERNEL_EFI;
    595     case LT_INITRD:
    596        return LT_INITRD_EFI;
    597     default:
    598        return type;
    599     }
    600        }
    601        return type;
    602    }
    603    
    604  static struct keywordTypes * getKeywordByType(enum lineType_e type,  static struct keywordTypes * getKeywordByType(enum lineType_e type,
    605        struct configFileInfo * cfi) {        struct configFileInfo * cfi) {
    606      struct keywordTypes * kw;      for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
         for (kw = cfi->keywords; kw->key; kw++) {  
    607   if (kw->type == type)   if (kw->type == type)
    608      return kw;      return kw;
    609      }      }
    # Line 601  static char * getuuidbydev(char *device) Line 633  static char * getuuidbydev(char *device)
    633    
    634  static enum lineType_e getTypeByKeyword(char * keyword,  static enum lineType_e getTypeByKeyword(char * keyword,
    635   struct configFileInfo * cfi) {   struct configFileInfo * cfi) {
    636      struct keywordTypes * kw;      for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
    637      for (kw = cfi->keywords; kw->key; kw++) {   if (cfi->caseInsensitive) {
    638   if (!strcmp(keyword, kw->key))      if (!strcasecmp(keyword, kw->key))
    639      return kw->type;                  return kw->type;
    640     } else {
    641        if (!strcmp(keyword, kw->key))
    642            return kw->type;
    643     }
    644      }      }
    645      return LT_UNKNOWN;      return LT_UNKNOWN;
    646  }  }
    # Line 689  static void lineInit(struct singleLine * Line 725  static void lineInit(struct singleLine *
    725  }  }
    726    
    727  struct singleLine * lineDup(struct singleLine * line) {  struct singleLine * lineDup(struct singleLine * line) {
         int i;  
    728      struct singleLine * newLine = malloc(sizeof(*newLine));      struct singleLine * newLine = malloc(sizeof(*newLine));
    729    
    730      newLine->indent = strdup(line->indent);      newLine->indent = strdup(line->indent);
    # Line 699  struct singleLine * lineDup(struct singl Line 734  struct singleLine * lineDup(struct singl
    734      newLine->elements = malloc(sizeof(*newLine->elements) *      newLine->elements = malloc(sizeof(*newLine->elements) *
    735         newLine->numElements);         newLine->numElements);
    736    
    737      for (i = 0; i < newLine->numElements; i++) {      for (int i = 0; i < newLine->numElements; i++) {
    738   newLine->elements[i].indent = strdup(line->elements[i].indent);   newLine->elements[i].indent = strdup(line->elements[i].indent);
    739   newLine->elements[i].item = strdup(line->elements[i].item);   newLine->elements[i].item = strdup(line->elements[i].item);
    740      }      }
    # Line 708  struct singleLine * lineDup(struct singl Line 743  struct singleLine * lineDup(struct singl
    743  }  }
    744    
    745  static void lineFree(struct singleLine * line) {  static void lineFree(struct singleLine * line) {
         int i;  
       
    746      if (line->indent) free(line->indent);      if (line->indent) free(line->indent);
    747    
    748      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
    749   free(line->elements[i].item);   free(line->elements[i].item);
    750   free(line->elements[i].indent);   free(line->elements[i].indent);
    751      }      }
    # Line 723  static void lineFree(struct singleLine * Line 756  static void lineFree(struct singleLine *
    756    
    757  static int lineWrite(FILE * out, struct singleLine * line,  static int lineWrite(FILE * out, struct singleLine * line,
    758       struct configFileInfo * cfi) {       struct configFileInfo * cfi) {
         int i;  
       
    759      if (fprintf(out, "%s", line->indent) == -1) return -1;      if (fprintf(out, "%s", line->indent) == -1) return -1;
    760    
    761      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
    762     /* Need to handle this, because we strip the quotes from
    763     * menuentry when read it. */
    764     if (line->type == LT_MENUENTRY && i == 1) {
    765        if(!isquote(*line->elements[i].item))
    766     fprintf(out, "\'%s\'", line->elements[i].item);
    767        else
    768     fprintf(out, "%s", line->elements[i].item);
    769        fprintf(out, "%s", line->elements[i].indent);
    770    
    771        continue;
    772     }
    773    
    774   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)
    775      if (fputc('"', out) == EOF) return -1;      if (fputc('"', out) == EOF) return -1;
    776    
    # Line 821  static int getNextLine(char ** bufPtr, s Line 864  static int getNextLine(char ** bufPtr, s
    864      if (*line->elements[0].item == '#') {      if (*line->elements[0].item == '#') {
    865   char * fullLine;   char * fullLine;
    866   int len;   int len;
      int i;  
    867    
    868   len = strlen(line->indent);   len = strlen(line->indent);
    869   for (i = 0; i < line->numElements; i++)   for (int i = 0; i < line->numElements; i++)
    870      len += strlen(line->elements[i].item) +      len += strlen(line->elements[i].item) +
    871     strlen(line->elements[i].indent);     strlen(line->elements[i].indent);
    872    
    # Line 833  static int getNextLine(char ** bufPtr, s Line 875  static int getNextLine(char ** bufPtr, s
    875   free(line->indent);   free(line->indent);
    876   line->indent = fullLine;   line->indent = fullLine;
    877    
    878   for (i = 0; i < line->numElements; i++) {   for (int i = 0; i < line->numElements; i++) {
    879      strcat(fullLine, line->elements[i].item);      strcat(fullLine, line->elements[i].item);
    880      strcat(fullLine, line->elements[i].indent);      strcat(fullLine, line->elements[i].indent);
    881      free(line->elements[i].item);      free(line->elements[i].item);
    # Line 852  static int getNextLine(char ** bufPtr, s Line 894  static int getNextLine(char ** bufPtr, s
    894   * elements up more   * elements up more
    895   */   */
    896   if (!isspace(kw->separatorChar)) {   if (!isspace(kw->separatorChar)) {
         int i;  
    897      char indent[2] = "";      char indent[2] = "";
    898      indent[0] = kw->separatorChar;      indent[0] = kw->separatorChar;
    899      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    900   char *p;   char *p;
      int j;  
    901   int numNewElements;   int numNewElements;
    902    
    903   numNewElements = 0;   numNewElements = 0;
    # Line 873  static int getNextLine(char ** bufPtr, s Line 913  static int getNextLine(char ** bufPtr, s
    913      sizeof(*line->elements) * elementsAlloced);      sizeof(*line->elements) * elementsAlloced);
    914   }   }
    915    
    916   for (j = line->numElements; j > i; j--) {   for (int j = line->numElements; j > i; j--) {
    917   line->elements[j + numNewElements] = line->elements[j];   line->elements[j + numNewElements] = line->elements[j];
    918   }   }
    919   line->numElements += numNewElements;   line->numElements += numNewElements;
    # Line 886  static int getNextLine(char ** bufPtr, s Line 926  static int getNextLine(char ** bufPtr, s
    926   break;   break;
    927   }   }
    928    
    929   free(line->elements[i].indent);   line->elements[i + 1].indent = line->elements[i].indent;
    930   line->elements[i].indent = strdup(indent);   line->elements[i].indent = strdup(indent);
    931   *p++ = '\0';   *p++ = '\0';
    932   i++;   i++;
    933   line->elements[i].item = strdup(p);   line->elements[i].item = strdup(p);
      line->elements[i].indent = strdup("");  
      p = line->elements[i].item;  
    934   }   }
    935      }      }
    936   }   }
    # Line 913  static struct grubConfig * readConfig(co Line 951  static struct grubConfig * readConfig(co
    951      struct singleLine * last = NULL, * line, * defaultLine = NULL;      struct singleLine * last = NULL, * line, * defaultLine = NULL;
    952      char * end;      char * end;
    953      struct singleEntry * entry = NULL;      struct singleEntry * entry = NULL;
    954      int i, len;      int len;
    955      char * buf;      char * buf;
    956    
    957      if (!strcmp(inName, "-")) {      if (!strcmp(inName, "-")) {
    # Line 976  static struct grubConfig * readConfig(co Line 1014  static struct grubConfig * readConfig(co
    1014   }   }
    1015    
    1016   if (line->type == LT_SET_VARIABLE) {   if (line->type == LT_SET_VARIABLE) {
         int i;  
    1017      dbgPrintf("found 'set' command (%d elements): ", line->numElements);      dbgPrintf("found 'set' command (%d elements): ", line->numElements);
    1018      dbgPrintf("%s", line->indent);      dbgPrintf("%s", line->indent);
    1019      for (i = 0; i < line->numElements; i++)      for (int i = 0; i < line->numElements; i++)
    1020   dbgPrintf("%s\"%s\"", line->elements[i].indent, line->elements[i].item);   dbgPrintf("\"%s\"%s", line->elements[i].item, line->elements[i].indent);
    1021      dbgPrintf("\n");      dbgPrintf("\n");
    1022      struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);      struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
    1023      if (kwType && line->numElements == 3 &&      if (kwType && line->numElements == 3 &&
    # Line 993  static struct grubConfig * readConfig(co Line 1030  static struct grubConfig * readConfig(co
    1030      cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;      cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
    1031      defaultLine = line;      defaultLine = line;
    1032    
    1033          } else if (line->type == LT_KERNEL) {          } else if (iskernel(line->type)) {
    1034      /* if by some freak chance this is multiboot and the "module"      /* if by some freak chance this is multiboot and the "module"
    1035       * lines came earlier in the template, make sure to use LT_HYPER       * lines came earlier in the template, make sure to use LT_HYPER
    1036       * instead of LT_KERNEL now       * instead of LT_KERNEL now
    # Line 1007  static struct grubConfig * readConfig(co Line 1044  static struct grubConfig * readConfig(co
    1044       * This only applies to grub, but that's the only place we       * This only applies to grub, but that's the only place we
    1045       * should find LT_MBMODULE lines anyway.       * should find LT_MBMODULE lines anyway.
    1046       */       */
    1047      struct singleLine * l;      for (struct singleLine *l = entry->lines; l; l = l->next) {
         for (l = entry->lines; l; l = l->next) {  
    1048   if (l->type == LT_HYPER)   if (l->type == LT_HYPER)
    1049      break;      break;
    1050   else if (l->type == LT_KERNEL) {   else if (iskernel(l->type)) {
    1051      l->type = LT_HYPER;      l->type = LT_HYPER;
    1052      break;      break;
    1053   }   }
    # Line 1028  static struct grubConfig * readConfig(co Line 1064  static struct grubConfig * readConfig(co
    1064   } else if (line->type == LT_TITLE && line->numElements > 1) {   } else if (line->type == LT_TITLE && line->numElements > 1) {
    1065      /* make the title a single argument (undoing our parsing) */      /* make the title a single argument (undoing our parsing) */
    1066      len = 0;      len = 0;
    1067      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    1068   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
    1069   len += strlen(line->elements[i].indent);   len += strlen(line->elements[i].indent);
    1070      }      }
    1071      buf = malloc(len + 1);      buf = malloc(len + 1);
    1072      *buf = '\0';      *buf = '\0';
    1073    
    1074      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    1075   strcat(buf, line->elements[i].item);   strcat(buf, line->elements[i].item);
    1076   free(line->elements[i].item);   free(line->elements[i].item);
    1077    
    # Line 1049  static struct grubConfig * readConfig(co Line 1085  static struct grubConfig * readConfig(co
    1085      line->elements[line->numElements - 1].indent;      line->elements[line->numElements - 1].indent;
    1086      line->elements[1].item = buf;      line->elements[1].item = buf;
    1087      line->numElements = 2;      line->numElements = 2;
    1088     } else if (line->type == LT_MENUENTRY && line->numElements > 3) {
    1089        /* let --remove-kernel="TITLE=what" work */
    1090        len = 0;
    1091        char *extras;
    1092        char *title;
    1093    
    1094        for (int i = 1; i < line->numElements; i++) {
    1095     len += strlen(line->elements[i].item);
    1096     len += strlen(line->elements[i].indent);
    1097        }
    1098        buf = malloc(len + 1);
    1099        *buf = '\0';
    1100    
    1101        /* allocate mem for extra flags. */
    1102        extras = malloc(len + 1);
    1103        *extras = '\0';
    1104    
    1105        /* get title. */
    1106        for (int i = 0; i < line->numElements; i++) {
    1107     if (!strcmp(line->elements[i].item, "menuentry"))
    1108        continue;
    1109     if (isquote(*line->elements[i].item))
    1110        title = line->elements[i].item + 1;
    1111     else
    1112        title = line->elements[i].item;
    1113    
    1114     len = strlen(title);
    1115            if (isquote(title[len-1])) {
    1116        strncat(buf, title,len-1);
    1117        break;
    1118     } else {
    1119        strcat(buf, title);
    1120        strcat(buf, line->elements[i].indent);
    1121     }
    1122        }
    1123    
    1124        /* get extras */
    1125        int count = 0;
    1126        for (int i = 0; i < line->numElements; i++) {
    1127     if (count >= 2) {
    1128        strcat(extras, line->elements[i].item);
    1129        strcat(extras, line->elements[i].indent);
    1130     }
    1131    
    1132     if (!strcmp(line->elements[i].item, "menuentry"))
    1133        continue;
    1134    
    1135     /* count ' or ", there should be two in menuentry line. */
    1136     if (isquote(*line->elements[i].item))
    1137        count++;
    1138    
    1139     len = strlen(line->elements[i].item);
    1140    
    1141     if (isquote(line->elements[i].item[len -1]))
    1142        count++;
    1143    
    1144     /* ok, we get the final ' or ", others are extras. */
    1145                }
    1146        line->elements[1].indent =
    1147     line->elements[line->numElements - 2].indent;
    1148        line->elements[1].item = buf;
    1149        line->elements[2].indent =
    1150     line->elements[line->numElements - 2].indent;
    1151        line->elements[2].item = extras;
    1152        line->numElements = 3;
    1153   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {
    1154      /* Strip off any " which may be present; they'll be put back      /* Strip off any " which may be present; they'll be put back
    1155         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 1058  static struct grubConfig * readConfig(co Line 1158  static struct grubConfig * readConfig(co
    1158      if (line->numElements >= 2) {      if (line->numElements >= 2) {
    1159   int last, len;   int last, len;
    1160    
    1161   if (*line->elements[1].item == '"')   if (isquote(*line->elements[1].item))
    1162      memmove(line->elements[1].item, line->elements[1].item + 1,      memmove(line->elements[1].item, line->elements[1].item + 1,
    1163      strlen(line->elements[1].item + 1) + 1);      strlen(line->elements[1].item + 1) + 1);
    1164    
    1165   last = line->numElements - 1;   last = line->numElements - 1;
    1166   len = strlen(line->elements[last].item) - 1;   len = strlen(line->elements[last].item) - 1;
    1167   if (line->elements[last].item[len] == '"')   if (isquote(line->elements[last].item[len]))
    1168      line->elements[last].item[len] = '\0';      line->elements[last].item[len] = '\0';
    1169      }      }
    1170   }   }
    # Line 1123  static struct grubConfig * readConfig(co Line 1223  static struct grubConfig * readConfig(co
    1223    
    1224      dbgPrintf("defaultLine is %s\n", defaultLine ? "set" : "unset");      dbgPrintf("defaultLine is %s\n", defaultLine ? "set" : "unset");
    1225      if (defaultLine) {      if (defaultLine) {
    1226   if (cfi->defaultIsVariable) {          if (defaultLine->numElements > 2 &&
    1227        cfi->defaultSupportSaved &&
    1228        !strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {
    1229        cfg->defaultImage = DEFAULT_SAVED_GRUB2;
    1230     } else if (cfi->defaultIsVariable) {
    1231      char *value = defaultLine->elements[2].item;      char *value = defaultLine->elements[2].item;
    1232      while (*value && (*value == '"' || *value == '\'' ||      while (*value && (*value == '"' || *value == '\'' ||
    1233      *value == ' ' || *value == '\t'))      *value == ' ' || *value == '\t'))
    # Line 1140  static struct grubConfig * readConfig(co Line 1244  static struct grubConfig * readConfig(co
    1244      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);
    1245      if (*end) cfg->defaultImage = -1;      if (*end) cfg->defaultImage = -1;
    1246   } else if (defaultLine->numElements >= 2) {   } else if (defaultLine->numElements >= 2) {
    1247      i = 0;      int i = 0;
    1248      while ((entry = findEntryByIndex(cfg, i))) {      while ((entry = findEntryByIndex(cfg, i))) {
    1249   for (line = entry->lines; line; line = line->next)   for (line = entry->lines; line; line = line->next)
    1250      if (line->type == LT_TITLE) break;      if (line->type == LT_TITLE) break;
    # Line 1180  static void writeDefault(FILE * out, cha Line 1284  static void writeDefault(FILE * out, cha
    1284    
    1285      if (cfg->defaultImage == DEFAULT_SAVED)      if (cfg->defaultImage == DEFAULT_SAVED)
    1286   fprintf(out, "%sdefault%ssaved\n", indent, separator);   fprintf(out, "%sdefault%ssaved\n", indent, separator);
    1287        else if (cfg->defaultImage == DEFAULT_SAVED_GRUB2)
    1288     fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
    1289      else if (cfg->defaultImage > -1) {      else if (cfg->defaultImage > -1) {
    1290   if (cfg->cfi->defaultIsIndex) {   if (cfg->cfi->defaultIsIndex) {
    1291      if (cfg->cfi->defaultIsVariable) {      if (cfg->cfi->defaultIsVariable) {
    # Line 1240  static int writeConfig(struct grubConfig Line 1346  static int writeConfig(struct grubConfig
    1346    
    1347      /* most likely the symlink is relative, so change our      /* most likely the symlink is relative, so change our
    1348         directory to the dir of the symlink */         directory to the dir of the symlink */
    1349              rc = chdir(dirname(strdupa(outName)));      char *dir = strdupa(outName);
    1350        rc = chdir(dirname(dir));
    1351      do {      do {
    1352   buf = alloca(len + 1);   buf = alloca(len + 1);
    1353   rc = readlink(basename(outName), buf, len);   rc = readlink(basename(outName), buf, len);
    # Line 1378  static char *findDiskForRoot() Line 1485  static char *findDiskForRoot()
    1485      buf[rc] = '\0';      buf[rc] = '\0';
    1486      chptr = buf;      chptr = buf;
    1487    
    1488        char *foundanswer = NULL;
    1489    
    1490      while (chptr && chptr != buf+rc) {      while (chptr && chptr != buf+rc) {
    1491          devname = chptr;          devname = chptr;
    1492    
    # Line 1405  static char *findDiskForRoot() Line 1514  static char *findDiskForRoot()
    1514           * for '/' obviously.           * for '/' obviously.
    1515           */           */
    1516          if (*(++chptr) == '/' && *(++chptr) == ' ') {          if (*(++chptr) == '/' && *(++chptr) == ' ') {
    1517              /*              /* remember the last / entry in mtab */
    1518               * 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);  
    1519          }          }
    1520    
    1521          /* Next line */          /* Next line */
    # Line 1420  static char *findDiskForRoot() Line 1524  static char *findDiskForRoot()
    1524              chptr++;              chptr++;
    1525      }      }
    1526    
    1527        /* Return the last / entry found */
    1528        if (foundanswer) {
    1529            chptr = strchr(foundanswer, ' ');
    1530            *chptr = '\0';
    1531            return strdup(foundanswer);
    1532        }
    1533    
    1534      return NULL;      return NULL;
    1535  }  }
    1536    
    # Line 1430  void printEntry(struct singleEntry * ent Line 1541  void printEntry(struct singleEntry * ent
    1541      for (line = entry->lines; line; line = line->next) {      for (line = entry->lines; line; line = line->next) {
    1542   fprintf(stderr, "DBG: %s", line->indent);   fprintf(stderr, "DBG: %s", line->indent);
    1543   for (i = 0; i < line->numElements; i++) {   for (i = 0; i < line->numElements; i++) {
    1544   fprintf(stderr, "%s%s",      /* Need to handle this, because we strip the quotes from
    1545         * menuentry when read it. */
    1546        if (line->type == LT_MENUENTRY && i == 1) {
    1547     if(!isquote(*line->elements[i].item))
    1548        fprintf(stderr, "\'%s\'", line->elements[i].item);
    1549     else
    1550        fprintf(stderr, "%s", line->elements[i].item);
    1551     fprintf(stderr, "%s", line->elements[i].indent);
    1552    
    1553     continue;
    1554        }
    1555        
    1556        fprintf(stderr, "%s%s",
    1557      line->elements[i].item, line->elements[i].indent);      line->elements[i].item, line->elements[i].indent);
    1558   }   }
    1559   fprintf(stderr, "\n");   fprintf(stderr, "\n");
    # Line 1457  static int endswith(const char *s, char Line 1580  static int endswith(const char *s, char
    1580  {  {
    1581   int slen;   int slen;
    1582    
    1583   if (!s && !s[0])   if (!s || !s[0])
    1584   return 0;   return 0;
    1585   slen = strlen(s) - 1;   slen = strlen(s) - 1;
    1586    
    # Line 1478  int suitableImage(struct singleEntry * e Line 1601  int suitableImage(struct singleEntry * e
    1601   return 0;   return 0;
    1602      }      }
    1603    
    1604      line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);      line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
    1605      if (!line) {      if (!line) {
    1606   notSuitablePrintf(entry, "no line found\n");   notSuitablePrintf(entry, "no line found\n");
    1607   return 0;   return 0;
    # Line 1608  struct singleEntry * findEntryByPath(str Line 1731  struct singleEntry * findEntryByPath(str
    1731   entry = findEntryByIndex(config, indexVars[i]);   entry = findEntryByIndex(config, indexVars[i]);
    1732   if (!entry) return NULL;   if (!entry) return NULL;
    1733    
    1734   line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
    1735   if (!line) return NULL;   if (!line) return NULL;
    1736    
    1737   if (index) *index = indexVars[i];   if (index) *index = indexVars[i];
    # Line 1646  struct singleEntry * findEntryByPath(str Line 1769  struct singleEntry * findEntryByPath(str
    1769    
    1770   if (!strncmp(kernel, "TITLE=", 6)) {   if (!strncmp(kernel, "TITLE=", 6)) {
    1771      prefix = "";      prefix = "";
    1772      checkType = LT_TITLE;      checkType = LT_TITLE|LT_MENUENTRY;
    1773      kernel += 6;      kernel += 6;
    1774   }   }
    1775    
    # Line 1657  struct singleEntry * findEntryByPath(str Line 1780  struct singleEntry * findEntryByPath(str
    1780    
    1781      /* check all the lines matching checkType */      /* check all the lines matching checkType */
    1782      for (line = entry->lines; line; line = line->next) {      for (line = entry->lines; line; line = line->next) {
    1783   line = getLineByType(entry->multiboot && checkType == LT_KERNEL ?   enum lineType_e ct = checkType;
    1784       LT_KERNEL|LT_MBMODULE|LT_HYPER :   if (entry->multiboot && checkType == LT_KERNEL)
    1785       checkType, line);      ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER;
    1786   if (!line) break;  /* not found in this entry */   else if (checkType & LT_KERNEL)
    1787        ct = checkType | LT_KERNEL_EFI;
    1788     line = getLineByType(ct, line);
    1789     if (!line)
    1790        break;  /* not found in this entry */
    1791    
    1792   if (line && line->numElements >= 2) {   if (line && line->type != LT_MENUENTRY &&
    1793     line->numElements >= 2) {
    1794      rootspec = getRootSpecifier(line->elements[1].item);      rootspec = getRootSpecifier(line->elements[1].item);
    1795      if (!strcmp(line->elements[1].item +      if (!strcmp(line->elements[1].item +
    1796   ((rootspec != NULL) ? strlen(rootspec) : 0),   ((rootspec != NULL) ? strlen(rootspec) : 0),
    1797   kernel + strlen(prefix)))   kernel + strlen(prefix)))
    1798   break;   break;
    1799   }   }
    1800     if(line->type == LT_MENUENTRY &&
    1801     !strcmp(line->elements[1].item, kernel))
    1802        break;
    1803      }      }
    1804    
    1805      /* make sure this entry has a kernel identifier; this skips      /* make sure this entry has a kernel identifier; this skips
    1806       * non-Linux boot entries (could find netbsd etc, though, which is       * non-Linux boot entries (could find netbsd etc, though, which is
    1807       * unfortunate)       * unfortunate)
    1808       */       */
    1809      if (line && getLineByType(LT_KERNEL|LT_HYPER, entry->lines))      if (line && getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines))
    1810   break; /* found 'im! */   break; /* found 'im! */
    1811   }   }
    1812    
    # Line 1760  void markRemovedImage(struct grubConfig Line 1891  void markRemovedImage(struct grubConfig
    1891        const char * prefix) {        const char * prefix) {
    1892      struct singleEntry * entry;      struct singleEntry * entry;
    1893    
    1894      if (!image) return;      if (!image)
    1895     return;
    1896    
    1897        /* check and see if we're removing the default image */
    1898        if (isdigit(*image)) {
    1899     entry = findEntryByPath(cfg, image, prefix, NULL);
    1900     if(entry)
    1901        entry->skip = 1;
    1902     return;
    1903        }
    1904    
    1905      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))
    1906   entry->skip = 1;   entry->skip = 1;
    # Line 1768  void markRemovedImage(struct grubConfig Line 1908  void markRemovedImage(struct grubConfig
    1908    
    1909  void setDefaultImage(struct grubConfig * config, int hasNew,  void setDefaultImage(struct grubConfig * config, int hasNew,
    1910       const char * defaultKernelPath, int newIsDefault,       const char * defaultKernelPath, int newIsDefault,
    1911       const char * prefix, int flags) {       const char * prefix, int flags, int index) {
    1912      struct singleEntry * entry, * entry2, * newDefault;      struct singleEntry * entry, * entry2, * newDefault;
    1913      int i, j;      int i, j;
    1914    
    1915      if (newIsDefault) {      if (newIsDefault) {
    1916   config->defaultImage = 0;   config->defaultImage = 0;
    1917   return;   return;
    1918        } else if ((index >= 0) && config->cfi->defaultIsIndex) {
    1919     if (findEntryByIndex(config, index))
    1920        config->defaultImage = index;
    1921     else
    1922        config->defaultImage = -1;
    1923     return;
    1924      } else if (defaultKernelPath) {      } else if (defaultKernelPath) {
    1925   i = 0;   i = 0;
    1926   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {
    # Line 1787  void setDefaultImage(struct grubConfig * Line 1933  void setDefaultImage(struct grubConfig *
    1933    
    1934      /* defaultImage now points to what we'd like to use, but before any order      /* defaultImage now points to what we'd like to use, but before any order
    1935         changes */         changes */
    1936      if (config->defaultImage == DEFAULT_SAVED)      if ((config->defaultImage == DEFAULT_SAVED) ||
    1937     (config->defaultImage == DEFAULT_SAVED_GRUB2))
    1938        /* default is set to saved, we don't want to change it */        /* default is set to saved, we don't want to change it */
    1939        return;        return;
    1940    
    # Line 1848  void displayEntry(struct singleEntry * e Line 1995  void displayEntry(struct singleEntry * e
    1995    
    1996      printf("index=%d\n", index);      printf("index=%d\n", index);
    1997    
    1998      line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);      line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
    1999      if (!line) {      if (!line) {
    2000          printf("non linux entry\n");          printf("non linux entry\n");
    2001          return;          return;
    2002      }      }
    2003    
    2004      printf("kernel=%s\n", line->elements[1].item);      if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    2005     printf("kernel=%s\n", line->elements[1].item);
    2006        else
    2007     printf("kernel=%s%s\n", prefix, line->elements[1].item);
    2008    
    2009      if (line->numElements >= 3) {      if (line->numElements >= 3) {
    2010   printf("args=\"");   printf("args=\"");
    # Line 1910  void displayEntry(struct singleEntry * e Line 2060  void displayEntry(struct singleEntry * e
    2060   printf("root=%s\n", s);   printf("root=%s\n", s);
    2061      }      }
    2062    
    2063      line = getLineByType(LT_INITRD, entry->lines);      line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);
    2064    
    2065      if (line && line->numElements >= 2) {      if (line && line->numElements >= 2) {
    2066   printf("initrd=%s", prefix);   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    2067        printf("initrd=");
    2068     else
    2069        printf("initrd=%s", prefix);
    2070    
    2071   for (i = 1; i < line->numElements; i++)   for (i = 1; i < line->numElements; i++)
    2072      printf("%s%s", line->elements[i].item, line->elements[i].indent);      printf("%s%s", line->elements[i].item, line->elements[i].indent);
    2073   printf("\n");   printf("\n");
    2074      }      }
    2075    
    2076        line = getLineByType(LT_TITLE, entry->lines);
    2077        if (line) {
    2078     printf("title=%s\n", line->elements[1].item);
    2079        } else {
    2080     char * title;
    2081     line = getLineByType(LT_MENUENTRY, entry->lines);
    2082     title = grub2ExtractTitle(line);
    2083     if (title)
    2084        printf("title=%s\n", title);
    2085        }
    2086    }
    2087    
    2088    int isSuseSystem(void) {
    2089        const char * path;
    2090        const static char default_path[] = "/etc/SuSE-release";
    2091    
    2092        if ((path = getenv("GRUBBY_SUSE_RELEASE")) == NULL)
    2093     path = default_path;
    2094    
    2095        if (!access(path, R_OK))
    2096     return 1;
    2097        return 0;
    2098    }
    2099    
    2100    int isSuseGrubConf(const char * path) {
    2101        FILE * grubConf;
    2102        char * line = NULL;
    2103        size_t len = 0, res = 0;
    2104    
    2105        grubConf = fopen(path, "r");
    2106        if (!grubConf) {
    2107            dbgPrintf("Could not open SuSE configuration file '%s'\n", path);
    2108     return 0;
    2109        }
    2110    
    2111        while ((res = getline(&line, &len, grubConf)) != -1) {
    2112     if (!strncmp(line, "setup", 5)) {
    2113        fclose(grubConf);
    2114        free(line);
    2115        return 1;
    2116     }
    2117        }
    2118    
    2119        dbgPrintf("SuSE configuration file '%s' does not appear to be valid\n",
    2120          path);
    2121    
    2122        fclose(grubConf);
    2123        free(line);
    2124        return 0;
    2125    }
    2126    
    2127    int suseGrubConfGetLba(const char * path, int * lbaPtr) {
    2128        FILE * grubConf;
    2129        char * line = NULL;
    2130        size_t res = 0, len = 0;
    2131    
    2132        if (!path) return 1;
    2133        if (!lbaPtr) return 1;
    2134    
    2135        grubConf = fopen(path, "r");
    2136        if (!grubConf) return 1;
    2137    
    2138        while ((res = getline(&line, &len, grubConf)) != -1) {
    2139     if (line[res - 1] == '\n')
    2140        line[res - 1] = '\0';
    2141     else if (len > res)
    2142        line[res] = '\0';
    2143     else {
    2144        line = realloc(line, res + 1);
    2145        line[res] = '\0';
    2146     }
    2147    
    2148     if (!strncmp(line, "setup", 5)) {
    2149        if (strstr(line, "--force-lba")) {
    2150            *lbaPtr = 1;
    2151        } else {
    2152            *lbaPtr = 0;
    2153        }
    2154        dbgPrintf("lba: %i\n", *lbaPtr);
    2155        break;
    2156     }
    2157        }
    2158    
    2159        free(line);
    2160        fclose(grubConf);
    2161        return 0;
    2162    }
    2163    
    2164    int suseGrubConfGetInstallDevice(const char * path, char ** devicePtr) {
    2165        FILE * grubConf;
    2166        char * line = NULL;
    2167        size_t res = 0, len = 0;
    2168        char * lastParamPtr = NULL;
    2169        char * secLastParamPtr = NULL;
    2170        char installDeviceNumber = '\0';
    2171        char * bounds = NULL;
    2172    
    2173        if (!path) return 1;
    2174        if (!devicePtr) return 1;
    2175    
    2176        grubConf = fopen(path, "r");
    2177        if (!grubConf) return 1;
    2178    
    2179        while ((res = getline(&line, &len, grubConf)) != -1) {
    2180     if (strncmp(line, "setup", 5))
    2181        continue;
    2182    
    2183     if (line[res - 1] == '\n')
    2184        line[res - 1] = '\0';
    2185     else if (len > res)
    2186        line[res] = '\0';
    2187     else {
    2188        line = realloc(line, res + 1);
    2189        line[res] = '\0';
    2190     }
    2191    
    2192     lastParamPtr = bounds = line + res;
    2193    
    2194     /* Last parameter in grub may be an optional IMAGE_DEVICE */
    2195     while (!isspace(*lastParamPtr))
    2196        lastParamPtr--;
    2197     lastParamPtr++;
    2198    
    2199     secLastParamPtr = lastParamPtr - 2;
    2200     dbgPrintf("lastParamPtr: %s\n", lastParamPtr);
    2201    
    2202     if (lastParamPtr + 3 > bounds) {
    2203        dbgPrintf("lastParamPtr going over boundary");
    2204        fclose(grubConf);
    2205        free(line);
    2206        return 1;
    2207     }
    2208     if (!strncmp(lastParamPtr, "(hd", 3))
    2209        lastParamPtr += 3;
    2210     dbgPrintf("lastParamPtr: %c\n", *lastParamPtr);
    2211    
    2212     /*
    2213     * Second last parameter will decide wether last parameter is
    2214     * an IMAGE_DEVICE or INSTALL_DEVICE
    2215     */
    2216     while (!isspace(*secLastParamPtr))
    2217        secLastParamPtr--;
    2218     secLastParamPtr++;
    2219    
    2220     if (secLastParamPtr + 3 > bounds) {
    2221        dbgPrintf("secLastParamPtr going over boundary");
    2222        fclose(grubConf);
    2223        free(line);
    2224        return 1;
    2225     }
    2226     dbgPrintf("secLastParamPtr: %s\n", secLastParamPtr);
    2227     if (!strncmp(secLastParamPtr, "(hd", 3)) {
    2228        secLastParamPtr += 3;
    2229        dbgPrintf("secLastParamPtr: %c\n", *secLastParamPtr);
    2230        installDeviceNumber = *secLastParamPtr;
    2231     } else {
    2232        installDeviceNumber = *lastParamPtr;
    2233     }
    2234    
    2235     *devicePtr = malloc(6);
    2236     snprintf(*devicePtr, 6, "(hd%c)", installDeviceNumber);
    2237     dbgPrintf("installDeviceNumber: %c\n", installDeviceNumber);
    2238     fclose(grubConf);
    2239     free(line);
    2240     return 0;
    2241        }
    2242    
    2243        free(line);
    2244        fclose(grubConf);
    2245        return 1;
    2246    }
    2247    
    2248    int grubGetBootFromDeviceMap(const char * device,
    2249         char ** bootPtr) {
    2250        FILE * deviceMap;
    2251        char * line = NULL;
    2252        size_t res = 0, len = 0;
    2253        char * devicePtr;
    2254        char * bounds = NULL;
    2255        const char * path;
    2256        const static char default_path[] = "/boot/grub/device.map";
    2257    
    2258        if (!device) return 1;
    2259        if (!bootPtr) return 1;
    2260    
    2261        if ((path = getenv("GRUBBY_GRUB_DEVICE_MAP")) == NULL)
    2262     path = default_path;
    2263    
    2264        dbgPrintf("opening grub device.map file from: %s\n", path);
    2265        deviceMap = fopen(path, "r");
    2266        if (!deviceMap)
    2267     return 1;
    2268    
    2269        while ((res = getline(&line, &len, deviceMap)) != -1) {
    2270            if (!strncmp(line, "#", 1))
    2271        continue;
    2272    
    2273     if (line[res - 1] == '\n')
    2274        line[res - 1] = '\0';
    2275     else if (len > res)
    2276        line[res] = '\0';
    2277     else {
    2278        line = realloc(line, res + 1);
    2279        line[res] = '\0';
    2280     }
    2281    
    2282     devicePtr = line;
    2283     bounds = line + res;
    2284    
    2285     while ((isspace(*line) && ((devicePtr + 1) <= bounds)))
    2286        devicePtr++;
    2287     dbgPrintf("device: %s\n", devicePtr);
    2288    
    2289     if (!strncmp(devicePtr, device, strlen(device))) {
    2290        devicePtr += strlen(device);
    2291        while (isspace(*devicePtr) && ((devicePtr + 1) <= bounds))
    2292            devicePtr++;
    2293    
    2294        *bootPtr = strdup(devicePtr);
    2295        break;
    2296     }
    2297        }
    2298    
    2299        free(line);
    2300        fclose(deviceMap);
    2301        return 0;
    2302    }
    2303    
    2304    int suseGrubConfGetBoot(const char * path, char ** bootPtr) {
    2305        char * grubDevice;
    2306    
    2307        if (suseGrubConfGetInstallDevice(path, &grubDevice))
    2308     dbgPrintf("error looking for grub installation device\n");
    2309        else
    2310     dbgPrintf("grubby installation device: %s\n", grubDevice);
    2311    
    2312        if (grubGetBootFromDeviceMap(grubDevice, bootPtr))
    2313     dbgPrintf("error looking for grub boot device\n");
    2314        else
    2315     dbgPrintf("grubby boot device: %s\n", *bootPtr);
    2316    
    2317        free(grubDevice);
    2318        return 0;
    2319    }
    2320    
    2321    int parseSuseGrubConf(int * lbaPtr, char ** bootPtr) {
    2322        /*
    2323         * This SuSE grub configuration file at this location is not your average
    2324         * grub configuration file, but instead the grub commands used to setup
    2325         * grub on that system.
    2326         */
    2327        const char * path;
    2328        const static char default_path[] = "/etc/grub.conf";
    2329    
    2330        if ((path = getenv("GRUBBY_SUSE_GRUB_CONF")) == NULL)
    2331     path = default_path;
    2332    
    2333        if (!isSuseGrubConf(path)) return 1;
    2334    
    2335        if (lbaPtr) {
    2336            *lbaPtr = 0;
    2337            if (suseGrubConfGetLba(path, lbaPtr))
    2338                return 1;
    2339        }
    2340    
    2341        if (bootPtr) {
    2342            *bootPtr = NULL;
    2343            suseGrubConfGetBoot(path, bootPtr);
    2344        }
    2345    
    2346        return 0;
    2347  }  }
    2348    
    2349  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {
    # Line 1968  int parseSysconfigGrub(int * lbaPtr, cha Line 2394  int parseSysconfigGrub(int * lbaPtr, cha
    2394  }  }
    2395    
    2396  void dumpSysconfigGrub(void) {  void dumpSysconfigGrub(void) {
    2397      char * boot;      char * boot = NULL;
    2398      int lba;      int lba;
    2399    
    2400      if (!parseSysconfigGrub(&lba, &boot)) {      if (isSuseSystem()) {
    2401   if (lba) printf("lba\n");          if (parseSuseGrubConf(&lba, &boot)) {
    2402   if (boot) printf("boot=%s\n", boot);      free(boot);
    2403        return;
    2404     }
    2405        } else {
    2406            if (parseSysconfigGrub(&lba, &boot)) {
    2407        free(boot);
    2408        return;
    2409     }
    2410        }
    2411    
    2412        if (lba) printf("lba\n");
    2413        if (boot) {
    2414     printf("boot=%s\n", boot);
    2415     free(boot);
    2416      }      }
    2417  }  }
    2418    
    # Line 2022  struct singleLine * addLineTmpl(struct s Line 2461  struct singleLine * addLineTmpl(struct s
    2461  {  {
    2462      struct singleLine * newLine = lineDup(tmplLine);      struct singleLine * newLine = lineDup(tmplLine);
    2463    
    2464        if (isEfi && cfi == &grub2ConfigType) {
    2465     enum lineType_e old = newLine->type;
    2466     newLine->type = preferredLineType(newLine->type, cfi);
    2467     if (old != newLine->type)
    2468        newLine->elements[0].item = getKeyByType(newLine->type, cfi);
    2469        }
    2470    
    2471      if (val) {      if (val) {
    2472   /* override the inherited value with our own.   /* override the inherited value with our own.
    2473   * 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 2031  struct singleLine * addLineTmpl(struct s Line 2477  struct singleLine * addLineTmpl(struct s
    2477   insertElement(newLine, val, 1, cfi);   insertElement(newLine, val, 1, cfi);
    2478    
    2479   /* but try to keep the rootspec from the template... sigh */   /* but try to keep the rootspec from the template... sigh */
    2480   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)) {
    2481      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);
    2482      if (rootspec != NULL) {      if (rootspec != NULL) {
    2483   free(newLine->elements[1].item);   free(newLine->elements[1].item);
    # Line 2068  struct singleLine *  addLine(struct sing Line 2514  struct singleLine *  addLine(struct sing
    2514      /* 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
    2515       * stack since it calls addLineTmpl which will make copies.       * stack since it calls addLineTmpl which will make copies.
    2516       */       */
       
    2517      if (type == LT_TITLE && cfi->titleBracketed) {      if (type == LT_TITLE && cfi->titleBracketed) {
    2518   /* we're doing a bracketed title (zipl) */   /* we're doing a bracketed title (zipl) */
    2519   tmpl.type = type;   tmpl.type = type;
    # Line 2172  void removeLine(struct singleEntry * ent Line 2617  void removeLine(struct singleEntry * ent
    2617      free(line);      free(line);
    2618  }  }
    2619    
     static int isquote(char q)  
     {  
         if (q == '\'' || q == '\"')  
      return 1;  
         return 0;  
     }  
       
    2620  static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)  static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)
    2621  {  {
    2622      struct singleLine newLine = {      struct singleLine newLine = {
    # Line 2409  int updateActualImage(struct grubConfig Line 2847  int updateActualImage(struct grubConfig
    2847      firstElement = 2;      firstElement = 2;
    2848    
    2849   } else {   } else {
    2850      line = getLineByType(LT_KERNEL|LT_MBMODULE, entry->lines);      line = getLineByType(LT_KERNEL|LT_MBMODULE|LT_KERNEL_EFI, entry->lines);
    2851      if (!line) {      if (!line) {
    2852   /* no LT_KERNEL or LT_MBMODULE in this entry? */   /* no LT_KERNEL or LT_MBMODULE in this entry? */
    2853   continue;   continue;
    # Line 2574  int updateInitrd(struct grubConfig * cfg Line 3012  int updateInitrd(struct grubConfig * cfg
    3012      if (!image) return 0;      if (!image) return 0;
    3013    
    3014      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
    3015          kernelLine = getLineByType(LT_KERNEL, entry->lines);          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI, entry->lines);
    3016          if (!kernelLine) continue;          if (!kernelLine) continue;
    3017    
    3018          line = getLineByType(LT_INITRD, entry->lines);          line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);
    3019          if (line)          if (line)
    3020              removeLine(entry, line);              removeLine(entry, line);
    3021          if (prefix) {          if (prefix) {
    # Line 2588  int updateInitrd(struct grubConfig * cfg Line 3026  int updateInitrd(struct grubConfig * cfg
    3026   endLine = getLineByType(LT_ENTRY_END, entry->lines);   endLine = getLineByType(LT_ENTRY_END, entry->lines);
    3027   if (endLine)   if (endLine)
    3028      removeLine(entry, endLine);      removeLine(entry, endLine);
    3029          line = addLine(entry, cfg->cfi, LT_INITRD, kernelLine->indent, initrd);          line = addLine(entry, cfg->cfi, preferredLineType(LT_INITRD, cfg->cfi),
    3030     kernelLine->indent, initrd);
    3031          if (!line)          if (!line)
    3032      return 1;      return 1;
    3033   if (endLine) {   if (endLine) {
    # Line 2794  int checkForGrub(struct grubConfig * con Line 3233  int checkForGrub(struct grubConfig * con
    3233      int fd;      int fd;
    3234      unsigned char bootSect[512];      unsigned char bootSect[512];
    3235      char * boot;      char * boot;
    3236        int onSuse = isSuseSystem();
    3237    
    3238      if (parseSysconfigGrub(NULL, &boot))  
    3239   return 0;      if (onSuse) {
    3240     if (parseSuseGrubConf(NULL, &boot))
    3241        return 0;
    3242        } else {
    3243     if (parseSysconfigGrub(NULL, &boot))
    3244        return 0;
    3245        }
    3246    
    3247      /* assume grub is not installed -- not an error condition */      /* assume grub is not installed -- not an error condition */
    3248      if (!boot)      if (!boot)
    # Line 2815  int checkForGrub(struct grubConfig * con Line 3261  int checkForGrub(struct grubConfig * con
    3261      }      }
    3262      close(fd);      close(fd);
    3263    
    3264        /* The more elaborate checks do not work on SuSE. The checks done
    3265         * seem to be reasonble (at least for now), so just return success
    3266         */
    3267        if (onSuse)
    3268     return 2;
    3269    
    3270      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
    3271  }  }
    3272    
    # Line 2848  int checkForExtLinux(struct grubConfig * Line 3300  int checkForExtLinux(struct grubConfig *
    3300      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
    3301  }  }
    3302    
    3303    int checkForYaboot(struct grubConfig * config) {
    3304        /*
    3305         * This is a simplistic check that we consider good enough for own puporses
    3306         *
    3307         * If we were to properly check if yaboot is *installed* we'd need to:
    3308         * 1) get the system boot device (LT_BOOT)
    3309         * 2) considering it's a raw filesystem, check if the yaboot binary matches
    3310         *    the content on the boot device
    3311         * 3) if not, copy the binary to a temporary file and run "addnote" on it
    3312         * 4) check again if binary and boot device contents match
    3313         */
    3314        if (!access("/etc/yaboot.conf", R_OK))
    3315     return 2;
    3316    
    3317        return 1;
    3318    }
    3319    
    3320    int checkForElilo(struct grubConfig * config) {
    3321        if (!access("/etc/elilo.conf", R_OK))
    3322     return 2;
    3323    
    3324        return 1;
    3325    }
    3326    
    3327  static char * getRootSpecifier(char * str) {  static char * getRootSpecifier(char * str) {
    3328      char * idx, * rootspec = NULL;      char * idx, * rootspec = NULL;
    3329    
    # Line 2862  static char * getRootSpecifier(char * st Line 3338  static char * getRootSpecifier(char * st
    3338  static char * getInitrdVal(struct grubConfig * config,  static char * getInitrdVal(struct grubConfig * config,
    3339     const char * prefix, struct singleLine *tmplLine,     const char * prefix, struct singleLine *tmplLine,
    3340     const char * newKernelInitrd,     const char * newKernelInitrd,
    3341     char ** extraInitrds, int extraInitrdCount)     const char ** extraInitrds, int extraInitrdCount)
    3342  {  {
    3343      char *initrdVal, *end;      char *initrdVal, *end;
    3344      int i;      int i;
    # Line 2907  static char * getInitrdVal(struct grubCo Line 3383  static char * getInitrdVal(struct grubCo
    3383    
    3384  int addNewKernel(struct grubConfig * config, struct singleEntry * template,  int addNewKernel(struct grubConfig * config, struct singleEntry * template,
    3385           const char * prefix,           const char * prefix,
    3386   char * newKernelPath, char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
    3387   char * newKernelArgs, char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
    3388   char ** extraInitrds, int extraInitrdCount,   const char ** extraInitrds, int extraInitrdCount,
    3389                   char * newMBKernel, char * newMBKernelArgs) {                   const char * newMBKernel, const char * newMBKernelArgs) {
    3390      struct singleEntry * new;      struct singleEntry * new;
    3391      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
    3392      int needs;      int needs;
    # Line 2964  int addNewKernel(struct grubConfig * con Line 3440  int addNewKernel(struct grubConfig * con
    3440      while (*chptr && isspace(*chptr)) chptr++;      while (*chptr && isspace(*chptr)) chptr++;
    3441      if (*chptr == '#') continue;      if (*chptr == '#') continue;
    3442    
    3443      if (tmplLine->type == LT_KERNEL &&      if (iskernel(tmplLine->type) && tmplLine->numElements >= 2) {
         tmplLine->numElements >= 2) {  
    3444   if (!template->multiboot && (needs & NEED_MB)) {   if (!template->multiboot && (needs & NEED_MB)) {
    3445      /* it's not a multiboot template and this is the kernel      /* it's not a multiboot template and this is the kernel
    3446       * line.  Try to be intelligent about inserting the       * line.  Try to be intelligent about inserting the
    # Line 3042  int addNewKernel(struct grubConfig * con Line 3517  int addNewKernel(struct grubConfig * con
    3517      /* template is multi but new is not,      /* template is multi but new is not,
    3518       * insert the kernel in the first module slot       * insert the kernel in the first module slot
    3519       */       */
    3520      tmplLine->type = LT_KERNEL;      tmplLine->type = preferredLineType(LT_KERNEL, config->cfi);
    3521      free(tmplLine->elements[0].item);      free(tmplLine->elements[0].item);
    3522      tmplLine->elements[0].item =      tmplLine->elements[0].item =
    3523   strdup(getKeywordByType(LT_KERNEL, config->cfi)->key);   strdup(getKeywordByType(tmplLine->type,
    3524     config->cfi)->key);
    3525      newLine = addLineTmpl(new, tmplLine, newLine,      newLine = addLineTmpl(new, tmplLine, newLine,
    3526    newKernelPath + strlen(prefix), config->cfi);    newKernelPath + strlen(prefix),
    3527      config->cfi);
    3528      needs &= ~NEED_KERNEL;      needs &= ~NEED_KERNEL;
    3529   } else if (needs & NEED_INITRD) {   } else if (needs & NEED_INITRD) {
    3530      char *initrdVal;      char *initrdVal;
    3531      /* template is multi but new is not,      /* template is multi but new is not,
    3532       * insert the initrd in the second module slot       * insert the initrd in the second module slot
    3533       */       */
    3534      tmplLine->type = LT_INITRD;      tmplLine->type = preferredLineType(LT_INITRD, config->cfi);
    3535      free(tmplLine->elements[0].item);      free(tmplLine->elements[0].item);
    3536      tmplLine->elements[0].item =      tmplLine->elements[0].item =
    3537   strdup(getKeywordByType(LT_INITRD, config->cfi)->key);   strdup(getKeywordByType(tmplLine->type,
    3538     config->cfi)->key);
    3539      initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);      initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);
    3540      newLine = addLineTmpl(new, tmplLine, newLine, initrdVal, config->cfi);      newLine = addLineTmpl(new, tmplLine, newLine, initrdVal, config->cfi);
    3541      free(initrdVal);      free(initrdVal);
    3542      needs &= ~NEED_INITRD;      needs &= ~NEED_INITRD;
    3543   }   }
    3544    
    3545      } else if (tmplLine->type == LT_INITRD &&      } else if (isinitrd(tmplLine->type) && tmplLine->numElements >= 2) {
            tmplLine->numElements >= 2) {  
    3546   if (needs & NEED_INITRD &&   if (needs & NEED_INITRD &&
    3547      new->multiboot && !template->multiboot &&      new->multiboot && !template->multiboot &&
    3548      config->cfi->mbInitRdIsModule) {      config->cfi->mbInitRdIsModule) {
    # Line 3119  int addNewKernel(struct grubConfig * con Line 3596  int addNewKernel(struct grubConfig * con
    3596      static const char *prefix = "'Loading ";      static const char *prefix = "'Loading ";
    3597      if (tmplLine->numElements > 1 &&      if (tmplLine->numElements > 1 &&
    3598      strstr(tmplLine->elements[1].item, prefix) &&      strstr(tmplLine->elements[1].item, prefix) &&
    3599      masterLine->next && masterLine->next->type == LT_KERNEL) {      masterLine->next &&
    3600        iskernel(masterLine->next->type)) {
    3601   char *newTitle = malloc(strlen(prefix) +   char *newTitle = malloc(strlen(prefix) +
    3602   strlen(newKernelTitle) + 2);   strlen(newKernelTitle) + 2);
    3603    
    # Line 3146  int addNewKernel(struct grubConfig * con Line 3624  int addNewKernel(struct grubConfig * con
    3624   */   */
    3625   switch (config->cfi->entryStart) {   switch (config->cfi->entryStart) {
    3626      case LT_KERNEL:      case LT_KERNEL:
    3627        case LT_KERNEL_EFI:
    3628   if (new->multiboot && config->cfi->mbHyperFirst) {   if (new->multiboot && config->cfi->mbHyperFirst) {
    3629      /* fall through to LT_HYPER */      /* fall through to LT_HYPER */
    3630   } else {   } else {
    3631      newLine = addLine(new, config->cfi, LT_KERNEL,      newLine = addLine(new, config->cfi,
    3632              preferredLineType(LT_KERNEL, config->cfi),
    3633        config->primaryIndent,        config->primaryIndent,
    3634        newKernelPath + strlen(prefix));        newKernelPath + strlen(prefix));
    3635      needs &= ~NEED_KERNEL;      needs &= ~NEED_KERNEL;
    # Line 3225  int addNewKernel(struct grubConfig * con Line 3705  int addNewKernel(struct grubConfig * con
    3705      if (needs & NEED_KERNEL) {      if (needs & NEED_KERNEL) {
    3706   newLine = addLine(new, config->cfi,   newLine = addLine(new, config->cfi,
    3707    (new->multiboot && getKeywordByType(LT_MBMODULE,    (new->multiboot && getKeywordByType(LT_MBMODULE,
    3708        config->cfi)) ?        config->cfi))
    3709    LT_MBMODULE : LT_KERNEL,     ? LT_MBMODULE
    3710     : preferredLineType(LT_KERNEL, config->cfi),
    3711    config->secondaryIndent,    config->secondaryIndent,
    3712    newKernelPath + strlen(prefix));    newKernelPath + strlen(prefix));
    3713   needs &= ~NEED_KERNEL;   needs &= ~NEED_KERNEL;
    # Line 3242  int addNewKernel(struct grubConfig * con Line 3723  int addNewKernel(struct grubConfig * con
    3723   initrdVal = getInitrdVal(config, prefix, NULL, newKernelInitrd, extraInitrds, extraInitrdCount);   initrdVal = getInitrdVal(config, prefix, NULL, newKernelInitrd, extraInitrds, extraInitrdCount);
    3724   newLine = addLine(new, config->cfi,   newLine = addLine(new, config->cfi,
    3725    (new->multiboot && getKeywordByType(LT_MBMODULE,    (new->multiboot && getKeywordByType(LT_MBMODULE,
    3726        config->cfi)) ?        config->cfi))
    3727    LT_MBMODULE : LT_INITRD,     ? LT_MBMODULE
    3728       : preferredLineType(LT_INITRD, config->cfi),
    3729    config->secondaryIndent,    config->secondaryIndent,
    3730    initrdVal);    initrdVal);
    3731   free(initrdVal);   free(initrdVal);
    # Line 3318  int main(int argc, const char ** argv) { Line 3800  int main(int argc, const char ** argv) {
    3800      int displayDefault = 0;      int displayDefault = 0;
    3801      int displayDefaultIndex = 0;      int displayDefaultIndex = 0;
    3802      int displayDefaultTitle = 0;      int displayDefaultTitle = 0;
    3803        int defaultIndex = -1;
    3804      struct poptOption options[] = {      struct poptOption options[] = {
    3805   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,
    3806      _("add an entry for the specified kernel"), _("kernel-path") },      _("add an entry for the specified kernel"), _("kernel-path") },
    # Line 3335  int main(int argc, const char ** argv) { Line 3818  int main(int argc, const char ** argv) {
    3818   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
    3819      _("filestystem which contains /boot directory (for testing only)"),      _("filestystem which contains /boot directory (for testing only)"),
    3820      _("bootfs") },      _("bootfs") },
    3821  #if defined(__i386__) || defined(__x86_64__)  #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
    3822   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
    3823      _("check if lilo is installed on lilo.conf boot sector") },      _("check which bootloader is installed on boot sector") },
    3824  #endif  #endif
    3825   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,
    3826      _("path to grub config file to update (\"-\" for stdin)"),      _("path to grub config file to update (\"-\" for stdin)"),
    # Line 3358  int main(int argc, const char ** argv) { Line 3841  int main(int argc, const char ** argv) {
    3841      _("display the title of the default kernel") },      _("display the title of the default kernel") },
    3842   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
    3843      _("configure elilo bootloader") },      _("configure elilo bootloader") },
    3844     { "efi", 0, POPT_ARG_NONE, &isEfi, 0,
    3845        _("force grub2 stanzas to use efi") },
    3846   { "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,   { "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,
    3847      _("configure extlinux bootloader (from syslinux)") },      _("configure extlinux bootloader (from syslinux)") },
    3848   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,
    # Line 3390  int main(int argc, const char ** argv) { Line 3875  int main(int argc, const char ** argv) {
    3875   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,
    3876      _("make the first entry referencing the specified kernel "      _("make the first entry referencing the specified kernel "
    3877        "the default"), _("kernel-path") },        "the default"), _("kernel-path") },
    3878     { "set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,
    3879        _("make the given entry index the default entry"),
    3880        _("entry-index") },
    3881   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,
    3882      _("configure silo bootloader") },      _("configure silo bootloader") },
    3883   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,
    # Line 3472  int main(int argc, const char ** argv) { Line 3960  int main(int argc, const char ** argv) {
    3960      }      }
    3961    
    3962      if (!cfi) {      if (!cfi) {
    3963            if (grub2FindConfig(&grub2ConfigType))
    3964        cfi = &grub2ConfigType;
    3965     else
    3966        #ifdef __ia64__        #ifdef __ia64__
    3967   cfi = &eliloConfigType;      cfi = &eliloConfigType;
    3968        #elif __powerpc__        #elif __powerpc__
    3969   cfi = &yabootConfigType;      cfi = &yabootConfigType;
    3970        #elif __sparc__        #elif __sparc__
    3971          cfi = &siloConfigType;              cfi = &siloConfigType;
    3972        #elif __s390__        #elif __s390__
    3973          cfi = &ziplConfigType;              cfi = &ziplConfigType;
    3974        #elif __s390x__        #elif __s390x__
    3975          cfi = &ziplConfigtype;              cfi = &ziplConfigtype;
    3976        #else        #else
             if (grub2FindConfig(&grub2ConfigType))  
         cfi = &grub2ConfigType;  
      else  
    3977      cfi = &grubConfigType;      cfi = &grubConfigType;
    3978        #endif        #endif
    3979      }      }
    # Line 3498  int main(int argc, const char ** argv) { Line 3986  int main(int argc, const char ** argv) {
    3986      }      }
    3987    
    3988      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||
    3989    newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
    3990    defaultKernel || displayDefaultIndex || displayDefaultTitle)) {      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
    3991        (defaultIndex >= 0))) {
    3992   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
    3993    "specified option"));    "specified option"));
    3994   return 1;   return 1;
    # Line 3541  int main(int argc, const char ** argv) { Line 4030  int main(int argc, const char ** argv) {
    4030   makeDefault = 1;   makeDefault = 1;
    4031   defaultKernel = NULL;   defaultKernel = NULL;
    4032      }      }
    4033        else if (defaultKernel && (defaultIndex >= 0)) {
    4034     fprintf(stderr, _("grubby: --set-default and --set-default-index "
    4035      "may not be used together\n"));
    4036     return 1;
    4037        }
    4038    
    4039      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {
    4040   fprintf(stderr, _("grubby: output file must be specified if stdin "   fprintf(stderr, _("grubby: output file must be specified if stdin "
    # Line 3549  int main(int argc, const char ** argv) { Line 4043  int main(int argc, const char ** argv) {
    4043      }      }
    4044    
    4045      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
    4046   && !kernelInfo && !bootloaderProbe && !updateKernelPath   && !kernelInfo && !bootloaderProbe && !updateKernelPath
    4047          && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle) {   && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle
    4048     && (defaultIndex == -1)) {
    4049   fprintf(stderr, _("grubby: no action specified\n"));   fprintf(stderr, _("grubby: no action specified\n"));
    4050   return 1;   return 1;
    4051      }      }
    # Line 3577  int main(int argc, const char ** argv) { Line 4072  int main(int argc, const char ** argv) {
    4072      }      }
    4073    
    4074      if (bootloaderProbe) {      if (bootloaderProbe) {
    4075   int lrc = 0, grc = 0, gr2c = 0, erc = 0;   int lrc = 0, grc = 0, gr2c = 0, extrc = 0, yrc = 0, erc = 0;
    4076   struct grubConfig * lconfig, * gconfig;   struct grubConfig * lconfig, * gconfig, * yconfig, * econfig;
    4077    
    4078   const char *grub2config = grub2FindConfig(&grub2ConfigType);   const char *grub2config = grub2FindConfig(&grub2ConfigType);
    4079   if (grub2config) {   if (grub2config) {
    # Line 3606  int main(int argc, const char ** argv) { Line 4101  int main(int argc, const char ** argv) {
    4101   lrc = checkForLilo(lconfig);   lrc = checkForLilo(lconfig);
    4102   }   }
    4103    
    4104     if (!access(eliloConfigType.defaultConfig, F_OK)) {
    4105        econfig = readConfig(eliloConfigType.defaultConfig,
    4106     &eliloConfigType);
    4107        if (!econfig)
    4108     erc = 1;
    4109        else
    4110     erc = checkForElilo(econfig);
    4111     }
    4112    
    4113   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {
    4114      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);
    4115      if (!lconfig)      if (!lconfig)
    4116   erc = 1;   extrc = 1;
    4117      else      else
    4118   erc = checkForExtLinux(lconfig);   extrc = checkForExtLinux(lconfig);
    4119   }   }
    4120    
    4121   if (lrc == 1 || grc == 1 || gr2c == 1) return 1;  
    4122     if (!access(yabootConfigType.defaultConfig, F_OK)) {
    4123        yconfig = readConfig(yabootConfigType.defaultConfig,
    4124     &yabootConfigType);
    4125        if (!yconfig)
    4126     yrc = 1;
    4127        else
    4128     yrc = checkForYaboot(yconfig);
    4129     }
    4130    
    4131     if (lrc == 1 || grc == 1 || gr2c == 1 || extrc == 1 || yrc == 1 ||
    4132     erc == 1)
    4133        return 1;
    4134    
    4135   if (lrc == 2) printf("lilo\n");   if (lrc == 2) printf("lilo\n");
    4136   if (gr2c == 2) printf("grub2\n");   if (gr2c == 2) printf("grub2\n");
    4137   if (grc == 2) printf("grub\n");   if (grc == 2) printf("grub\n");
    4138   if (erc == 2) printf("extlinux\n");   if (extrc == 2) printf("extlinux\n");
    4139     if (yrc == 2) printf("yaboot\n");
    4140     if (erc == 2) printf("elilo\n");
    4141    
    4142   return 0;   return 0;
    4143      }      }
    # Line 3637  int main(int argc, const char ** argv) { Line 4155  int main(int argc, const char ** argv) {
    4155   if (!entry) return 0;   if (!entry) return 0;
    4156   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
    4157    
    4158   line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
    4159   if (!line) return 0;   if (!line) return 0;
    4160    
    4161          rootspec = getRootSpecifier(line->elements[1].item);          rootspec = getRootSpecifier(line->elements[1].item);
    # Line 3686  int main(int argc, const char ** argv) { Line 4204  int main(int argc, const char ** argv) {
    4204      markRemovedImage(config, removeKernelPath, bootPrefix);      markRemovedImage(config, removeKernelPath, bootPrefix);
    4205      markRemovedImage(config, removeMBKernel, bootPrefix);      markRemovedImage(config, removeMBKernel, bootPrefix);
    4206      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,
    4207      bootPrefix, flags);      bootPrefix, flags, defaultIndex);
    4208      setFallbackImage(config, newKernelPath != NULL);      setFallbackImage(config, newKernelPath != NULL);
    4209      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
    4210                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
    # Line 3696  int main(int argc, const char ** argv) { Line 4214  int main(int argc, const char ** argv) {
    4214      }      }
    4215      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
    4216                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
    4217                       extraInitrds, extraInitrdCount,                       (const char **)extraInitrds, extraInitrdCount,
    4218                       newMBKernel, newMBKernelArgs)) return 1;                       newMBKernel, newMBKernelArgs)) return 1;
    4219            
    4220    
    Legend:
    Removed from v.1746  
    changed lines
      Added in v.2056