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 1748 by niro, Sat Feb 18 01:07:15 2012 UTC revision 1864 by niro, Mon Jul 2 13:20:31 2012 UTC
    # Line 164  struct keywordTypes grubKeywords[] = { Line 164  struct keywordTypes grubKeywords[] = {
    164    
    165  const char *grubFindConfig(struct configFileInfo *cfi) {  const char *grubFindConfig(struct configFileInfo *cfi) {
    166      static const char *configFiles[] = {      static const char *configFiles[] = {
      "/etc/grub.conf",  
    167   "/boot/grub/grub.conf",   "/boot/grub/grub.conf",
    168   "/boot/grub/menu.lst",   "/boot/grub/menu.lst",
    169     "/etc/grub.conf",
    170   NULL   NULL
    171      };      };
    172      static int i = -1;      static int i = -1;
    # Line 243  const char *grub2FindConfig(struct confi Line 243  const char *grub2FindConfig(struct confi
    243  }  }
    244    
    245  int sizeOfSingleLine(struct singleLine * line) {  int sizeOfSingleLine(struct singleLine * line) {
       int i;  
    246    int count = 0;    int count = 0;
    247    
    248    for (i = 0; i < line->numElements; i++) {    for (int i = 0; i < line->numElements; i++) {
    249      int indentSize = 0;      int indentSize = 0;
    250    
    251      count = count + strlen(line->elements[i].item);      count = count + strlen(line->elements[i].item);
    # Line 265  int sizeOfSingleLine(struct singleLine * Line 264  int sizeOfSingleLine(struct singleLine *
    264    return count;    return count;
    265  }  }
    266    
    267    static int isquote(char q)
    268    {
    269        if (q == '\'' || q == '\"')
    270     return 1;
    271        return 0;
    272    }
    273    
    274  char *grub2ExtractTitle(struct singleLine * line) {  char *grub2ExtractTitle(struct singleLine * line) {
    275      char * current;      char * current;
    276      char * current_indent;      char * current_indent;
    # Line 281  char *grub2ExtractTitle(struct singleLin Line 287  char *grub2ExtractTitle(struct singleLin
    287      current_len = strlen(current);      current_len = strlen(current);
    288    
    289      /* if second word is quoted, strip the quotes and return single word */      /* if second word is quoted, strip the quotes and return single word */
    290      if ((*current == '\'') && (*(current + current_len - 1) == '\'')) {      if (isquote(*current) && isquote(current[current_len - 1])) {
    291        char *tmp;   char *tmp;
    292    
    293        tmp = strdup(current);   tmp = strdup(current);
    294        *(tmp + current_len - 1) = '\0';   *(tmp + current_len - 1) = '\0';
    295        return ++tmp;   return ++tmp;
    296      }      }
    297    
    298      /* if no quotes, return second word verbatim */      /* if no quotes, return second word verbatim */
    299      if (*current != '\'') {      if (!isquote(*current))
    300        return current;   return current;
         }  
    301    
    302      /* 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
    303       * whose last character is also quote (assuming it's the closing one) */       * whose last character is also quote (assuming it's the closing one) */
    304      if (*current == '\'') {      int resultMaxSize;
    305        int resultMaxSize;      char * result;
    306        char * result;      
    307        resultMaxSize = sizeOfSingleLine(line);
    308        resultMaxSize = sizeOfSingleLine(line);      result = malloc(resultMaxSize);
    309        result = malloc(resultMaxSize);      snprintf(result, resultMaxSize, "%s", ++current);
    310        snprintf(result, resultMaxSize, "%s", ++current);      
    311        i++;
    312        i++;      for (; i < line->numElements; ++i) {
           for (; i < line->numElements; ++i) {  
    313   current = line->elements[i].item;   current = line->elements[i].item;
    314   current_len = strlen(current);   current_len = strlen(current);
    315   current_indent = line->elements[i].indent;   current_indent = line->elements[i].indent;
    316   current_indent_len = strlen(current_indent);   current_indent_len = strlen(current_indent);
    317    
    318   strncat(result, current_indent, current_indent_len);   strncat(result, current_indent, current_indent_len);
    319   if (*(current + current_len - 1) != '\'') {   if (!isquote(current[current_len-1])) {
    320    strncat(result, current, current_len);      strncat(result, current, current_len);
    321   } else {   } else {
    322    strncat(result, current, current_len - 1);      strncat(result, current, current_len - 1);
    323    break;      break;
    324   }   }
           }  
           return result;  
    325      }      }
    326        return result;
         return NULL;  
    327  }  }
    328    
    329  struct configFileInfo grub2ConfigType = {  struct configFileInfo grub2ConfigType = {
    # Line 571  static char * sdupprintf(const char *for Line 572  static char * sdupprintf(const char *for
    572    
    573  static struct keywordTypes * getKeywordByType(enum lineType_e type,  static struct keywordTypes * getKeywordByType(enum lineType_e type,
    574        struct configFileInfo * cfi) {        struct configFileInfo * cfi) {
    575      struct keywordTypes * kw;      for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
         for (kw = cfi->keywords; kw->key; kw++) {  
    576   if (kw->type == type)   if (kw->type == type)
    577      return kw;      return kw;
    578      }      }
    # Line 602  static char * getuuidbydev(char *device) Line 602  static char * getuuidbydev(char *device)
    602    
    603  static enum lineType_e getTypeByKeyword(char * keyword,  static enum lineType_e getTypeByKeyword(char * keyword,
    604   struct configFileInfo * cfi) {   struct configFileInfo * cfi) {
    605      struct keywordTypes * kw;      for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
         for (kw = cfi->keywords; kw->key; kw++) {  
    606   if (!strcmp(keyword, kw->key))   if (!strcmp(keyword, kw->key))
    607      return kw->type;      return kw->type;
    608      }      }
    # Line 690  static void lineInit(struct singleLine * Line 689  static void lineInit(struct singleLine *
    689  }  }
    690    
    691  struct singleLine * lineDup(struct singleLine * line) {  struct singleLine * lineDup(struct singleLine * line) {
         int i;  
    692      struct singleLine * newLine = malloc(sizeof(*newLine));      struct singleLine * newLine = malloc(sizeof(*newLine));
    693    
    694      newLine->indent = strdup(line->indent);      newLine->indent = strdup(line->indent);
    # Line 700  struct singleLine * lineDup(struct singl Line 698  struct singleLine * lineDup(struct singl
    698      newLine->elements = malloc(sizeof(*newLine->elements) *      newLine->elements = malloc(sizeof(*newLine->elements) *
    699         newLine->numElements);         newLine->numElements);
    700    
    701      for (i = 0; i < newLine->numElements; i++) {      for (int i = 0; i < newLine->numElements; i++) {
    702   newLine->elements[i].indent = strdup(line->elements[i].indent);   newLine->elements[i].indent = strdup(line->elements[i].indent);
    703   newLine->elements[i].item = strdup(line->elements[i].item);   newLine->elements[i].item = strdup(line->elements[i].item);
    704      }      }
    # Line 709  struct singleLine * lineDup(struct singl Line 707  struct singleLine * lineDup(struct singl
    707  }  }
    708    
    709  static void lineFree(struct singleLine * line) {  static void lineFree(struct singleLine * line) {
         int i;  
       
    710      if (line->indent) free(line->indent);      if (line->indent) free(line->indent);
    711    
    712      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
    713   free(line->elements[i].item);   free(line->elements[i].item);
    714   free(line->elements[i].indent);   free(line->elements[i].indent);
    715      }      }
    # Line 724  static void lineFree(struct singleLine * Line 720  static void lineFree(struct singleLine *
    720    
    721  static int lineWrite(FILE * out, struct singleLine * line,  static int lineWrite(FILE * out, struct singleLine * line,
    722       struct configFileInfo * cfi) {       struct configFileInfo * cfi) {
         int i;  
       
    723      if (fprintf(out, "%s", line->indent) == -1) return -1;      if (fprintf(out, "%s", line->indent) == -1) return -1;
    724    
    725      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
    726     /* Need to handle this, because we strip the quotes from
    727     * menuentry when read it. */
    728     if (line->type == LT_MENUENTRY && i == 1) {
    729        if(!isquote(*line->elements[i].item))
    730     fprintf(out, "\'%s\'", line->elements[i].item);
    731        else
    732     fprintf(out, "%s", line->elements[i].item);
    733        fprintf(out, "%s", line->elements[i].indent);
    734    
    735        continue;
    736     }
    737    
    738   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)
    739      if (fputc('"', out) == EOF) return -1;      if (fputc('"', out) == EOF) return -1;
    740    
    # Line 822  static int getNextLine(char ** bufPtr, s Line 828  static int getNextLine(char ** bufPtr, s
    828      if (*line->elements[0].item == '#') {      if (*line->elements[0].item == '#') {
    829   char * fullLine;   char * fullLine;
    830   int len;   int len;
      int i;  
    831    
    832   len = strlen(line->indent);   len = strlen(line->indent);
    833   for (i = 0; i < line->numElements; i++)   for (int i = 0; i < line->numElements; i++)
    834      len += strlen(line->elements[i].item) +      len += strlen(line->elements[i].item) +
    835     strlen(line->elements[i].indent);     strlen(line->elements[i].indent);
    836    
    # Line 834  static int getNextLine(char ** bufPtr, s Line 839  static int getNextLine(char ** bufPtr, s
    839   free(line->indent);   free(line->indent);
    840   line->indent = fullLine;   line->indent = fullLine;
    841    
    842   for (i = 0; i < line->numElements; i++) {   for (int i = 0; i < line->numElements; i++) {
    843      strcat(fullLine, line->elements[i].item);      strcat(fullLine, line->elements[i].item);
    844      strcat(fullLine, line->elements[i].indent);      strcat(fullLine, line->elements[i].indent);
    845      free(line->elements[i].item);      free(line->elements[i].item);
    # Line 853  static int getNextLine(char ** bufPtr, s Line 858  static int getNextLine(char ** bufPtr, s
    858   * elements up more   * elements up more
    859   */   */
    860   if (!isspace(kw->separatorChar)) {   if (!isspace(kw->separatorChar)) {
         int i;  
    861      char indent[2] = "";      char indent[2] = "";
    862      indent[0] = kw->separatorChar;      indent[0] = kw->separatorChar;
    863      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    864   char *p;   char *p;
      int j;  
    865   int numNewElements;   int numNewElements;
    866    
    867   numNewElements = 0;   numNewElements = 0;
    # Line 874  static int getNextLine(char ** bufPtr, s Line 877  static int getNextLine(char ** bufPtr, s
    877      sizeof(*line->elements) * elementsAlloced);      sizeof(*line->elements) * elementsAlloced);
    878   }   }
    879    
    880   for (j = line->numElements; j > i; j--) {   for (int j = line->numElements; j > i; j--) {
    881   line->elements[j + numNewElements] = line->elements[j];   line->elements[j + numNewElements] = line->elements[j];
    882   }   }
    883   line->numElements += numNewElements;   line->numElements += numNewElements;
    # Line 887  static int getNextLine(char ** bufPtr, s Line 890  static int getNextLine(char ** bufPtr, s
    890   break;   break;
    891   }   }
    892    
    893   free(line->elements[i].indent);   line->elements[i + 1].indent = line->elements[i].indent;
    894   line->elements[i].indent = strdup(indent);   line->elements[i].indent = strdup(indent);
    895   *p++ = '\0';   *p++ = '\0';
    896   i++;   i++;
    897   line->elements[i].item = strdup(p);   line->elements[i].item = strdup(p);
      line->elements[i].indent = strdup("");  
      p = line->elements[i].item;  
    898   }   }
    899      }      }
    900   }   }
    # Line 914  static struct grubConfig * readConfig(co Line 915  static struct grubConfig * readConfig(co
    915      struct singleLine * last = NULL, * line, * defaultLine = NULL;      struct singleLine * last = NULL, * line, * defaultLine = NULL;
    916      char * end;      char * end;
    917      struct singleEntry * entry = NULL;      struct singleEntry * entry = NULL;
    918      int i, len;      int len;
    919      char * buf;      char * buf;
    920    
    921      if (!strcmp(inName, "-")) {      if (!strcmp(inName, "-")) {
    # Line 977  static struct grubConfig * readConfig(co Line 978  static struct grubConfig * readConfig(co
    978   }   }
    979    
    980   if (line->type == LT_SET_VARIABLE) {   if (line->type == LT_SET_VARIABLE) {
         int i;  
    981      dbgPrintf("found 'set' command (%d elements): ", line->numElements);      dbgPrintf("found 'set' command (%d elements): ", line->numElements);
    982      dbgPrintf("%s", line->indent);      dbgPrintf("%s", line->indent);
    983      for (i = 0; i < line->numElements; i++)      for (int i = 0; i < line->numElements; i++)
    984   dbgPrintf("%s\"%s\"", line->elements[i].indent, line->elements[i].item);   dbgPrintf("\"%s\"%s", line->elements[i].item, line->elements[i].indent);
    985      dbgPrintf("\n");      dbgPrintf("\n");
    986      struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);      struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
    987      if (kwType && line->numElements == 3 &&      if (kwType && line->numElements == 3 &&
    # Line 1008  static struct grubConfig * readConfig(co Line 1008  static struct grubConfig * readConfig(co
    1008       * This only applies to grub, but that's the only place we       * This only applies to grub, but that's the only place we
    1009       * should find LT_MBMODULE lines anyway.       * should find LT_MBMODULE lines anyway.
    1010       */       */
    1011      struct singleLine * l;      for (struct singleLine *l = entry->lines; l; l = l->next) {
         for (l = entry->lines; l; l = l->next) {  
    1012   if (l->type == LT_HYPER)   if (l->type == LT_HYPER)
    1013      break;      break;
    1014   else if (l->type == LT_KERNEL) {   else if (l->type == LT_KERNEL) {
    # Line 1029  static struct grubConfig * readConfig(co Line 1028  static struct grubConfig * readConfig(co
    1028   } else if (line->type == LT_TITLE && line->numElements > 1) {   } else if (line->type == LT_TITLE && line->numElements > 1) {
    1029      /* make the title a single argument (undoing our parsing) */      /* make the title a single argument (undoing our parsing) */
    1030      len = 0;      len = 0;
    1031      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    1032   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
    1033   len += strlen(line->elements[i].indent);   len += strlen(line->elements[i].indent);
    1034      }      }
    1035      buf = malloc(len + 1);      buf = malloc(len + 1);
    1036      *buf = '\0';      *buf = '\0';
    1037    
    1038      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    1039   strcat(buf, line->elements[i].item);   strcat(buf, line->elements[i].item);
    1040   free(line->elements[i].item);   free(line->elements[i].item);
    1041    
    # Line 1050  static struct grubConfig * readConfig(co Line 1049  static struct grubConfig * readConfig(co
    1049      line->elements[line->numElements - 1].indent;      line->elements[line->numElements - 1].indent;
    1050      line->elements[1].item = buf;      line->elements[1].item = buf;
    1051      line->numElements = 2;      line->numElements = 2;
    1052     } else if (line->type == LT_MENUENTRY && line->numElements > 3) {
    1053        /* let --remove-kernel="TITLE=what" work */
    1054        len = 0;
    1055        char *extras;
    1056        char *title;
    1057    
    1058        for (int i = 1; i < line->numElements; i++) {
    1059     len += strlen(line->elements[i].item);
    1060     len += strlen(line->elements[i].indent);
    1061        }
    1062        buf = malloc(len + 1);
    1063        *buf = '\0';
    1064    
    1065        /* allocate mem for extra flags. */
    1066        extras = malloc(len + 1);
    1067        *extras = '\0';
    1068    
    1069        /* get title. */
    1070        for (int i = 0; i < line->numElements; i++) {
    1071     if (!strcmp(line->elements[i].item, "menuentry"))
    1072        continue;
    1073     if (isquote(*line->elements[i].item))
    1074        title = line->elements[i].item + 1;
    1075     else
    1076        title = line->elements[i].item;
    1077    
    1078     len = strlen(title);
    1079            if (isquote(title[len-1])) {
    1080        strncat(buf, title,len-1);
    1081        break;
    1082     } else {
    1083        strcat(buf, title);
    1084        strcat(buf, line->elements[i].indent);
    1085     }
    1086        }
    1087    
    1088        /* get extras */
    1089        int count = 0;
    1090        for (int i = 0; i < line->numElements; i++) {
    1091     if (count >= 2) {
    1092        strcat(extras, line->elements[i].item);
    1093        strcat(extras, line->elements[i].indent);
    1094     }
    1095    
    1096     if (!strcmp(line->elements[i].item, "menuentry"))
    1097        continue;
    1098    
    1099     /* count ' or ", there should be two in menuentry line. */
    1100     if (isquote(*line->elements[i].item))
    1101        count++;
    1102    
    1103     len = strlen(line->elements[i].item);
    1104    
    1105     if (isquote(line->elements[i].item[len -1]))
    1106        count++;
    1107    
    1108     /* ok, we get the final ' or ", others are extras. */
    1109                }
    1110        line->elements[1].indent =
    1111     line->elements[line->numElements - 2].indent;
    1112        line->elements[1].item = buf;
    1113        line->elements[2].indent =
    1114     line->elements[line->numElements - 2].indent;
    1115        line->elements[2].item = extras;
    1116        line->numElements = 3;
    1117   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {
    1118      /* Strip off any " which may be present; they'll be put back      /* Strip off any " which may be present; they'll be put back
    1119         on write. This is one of the few (the only?) places that grubby         on write. This is one of the few (the only?) places that grubby
    # Line 1059  static struct grubConfig * readConfig(co Line 1122  static struct grubConfig * readConfig(co
    1122      if (line->numElements >= 2) {      if (line->numElements >= 2) {
    1123   int last, len;   int last, len;
    1124    
    1125   if (*line->elements[1].item == '"')   if (isquote(*line->elements[1].item))
    1126      memmove(line->elements[1].item, line->elements[1].item + 1,      memmove(line->elements[1].item, line->elements[1].item + 1,
    1127      strlen(line->elements[1].item + 1) + 1);      strlen(line->elements[1].item + 1) + 1);
    1128    
    1129   last = line->numElements - 1;   last = line->numElements - 1;
    1130   len = strlen(line->elements[last].item) - 1;   len = strlen(line->elements[last].item) - 1;
    1131   if (line->elements[last].item[len] == '"')   if (isquote(line->elements[last].item[len]))
    1132      line->elements[last].item[len] = '\0';      line->elements[last].item[len] = '\0';
    1133      }      }
    1134   }   }
    # Line 1145  static struct grubConfig * readConfig(co Line 1208  static struct grubConfig * readConfig(co
    1208      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);
    1209      if (*end) cfg->defaultImage = -1;      if (*end) cfg->defaultImage = -1;
    1210   } else if (defaultLine->numElements >= 2) {   } else if (defaultLine->numElements >= 2) {
    1211      i = 0;      int i = 0;
    1212      while ((entry = findEntryByIndex(cfg, i))) {      while ((entry = findEntryByIndex(cfg, i))) {
    1213   for (line = entry->lines; line; line = line->next)   for (line = entry->lines; line; line = line->next)
    1214      if (line->type == LT_TITLE) break;      if (line->type == LT_TITLE) break;
    # Line 1247  static int writeConfig(struct grubConfig Line 1310  static int writeConfig(struct grubConfig
    1310    
    1311      /* most likely the symlink is relative, so change our      /* most likely the symlink is relative, so change our
    1312         directory to the dir of the symlink */         directory to the dir of the symlink */
    1313              rc = chdir(dirname(strdupa(outName)));              rc = chdir(dirname(outName));
    1314      do {      do {
    1315   buf = alloca(len + 1);   buf = alloca(len + 1);
    1316   rc = readlink(basename(outName), buf, len);   rc = readlink(basename(outName), buf, len);
    # Line 1385  static char *findDiskForRoot() Line 1448  static char *findDiskForRoot()
    1448      buf[rc] = '\0';      buf[rc] = '\0';
    1449      chptr = buf;      chptr = buf;
    1450    
    1451        char *foundanswer = NULL;
    1452    
    1453      while (chptr && chptr != buf+rc) {      while (chptr && chptr != buf+rc) {
    1454          devname = chptr;          devname = chptr;
    1455    
    # Line 1412  static char *findDiskForRoot() Line 1477  static char *findDiskForRoot()
    1477           * for '/' obviously.           * for '/' obviously.
    1478           */           */
    1479          if (*(++chptr) == '/' && *(++chptr) == ' ') {          if (*(++chptr) == '/' && *(++chptr) == ' ') {
    1480              /*              /* remember the last / entry in mtab */
    1481               * 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);  
    1482          }          }
    1483    
    1484          /* Next line */          /* Next line */
    # Line 1427  static char *findDiskForRoot() Line 1487  static char *findDiskForRoot()
    1487              chptr++;              chptr++;
    1488      }      }
    1489    
    1490        /* Return the last / entry found */
    1491        if (foundanswer) {
    1492            chptr = strchr(foundanswer, ' ');
    1493            *chptr = '\0';
    1494            return strdup(foundanswer);
    1495        }
    1496    
    1497      return NULL;      return NULL;
    1498  }  }
    1499    
    # Line 1437  void printEntry(struct singleEntry * ent Line 1504  void printEntry(struct singleEntry * ent
    1504      for (line = entry->lines; line; line = line->next) {      for (line = entry->lines; line; line = line->next) {
    1505   fprintf(stderr, "DBG: %s", line->indent);   fprintf(stderr, "DBG: %s", line->indent);
    1506   for (i = 0; i < line->numElements; i++) {   for (i = 0; i < line->numElements; i++) {
    1507   fprintf(stderr, "%s%s",      /* Need to handle this, because we strip the quotes from
    1508         * menuentry when read it. */
    1509        if (line->type == LT_MENUENTRY && i == 1) {
    1510     if(!isquote(*line->elements[i].item))
    1511        fprintf(stderr, "\'%s\'", line->elements[i].item);
    1512     else
    1513        fprintf(stderr, "%s", line->elements[i].item);
    1514     fprintf(stderr, "%s", line->elements[i].indent);
    1515    
    1516     continue;
    1517        }
    1518        
    1519        fprintf(stderr, "%s%s",
    1520      line->elements[i].item, line->elements[i].indent);      line->elements[i].item, line->elements[i].indent);
    1521   }   }
    1522   fprintf(stderr, "\n");   fprintf(stderr, "\n");
    # Line 1464  static int endswith(const char *s, char Line 1543  static int endswith(const char *s, char
    1543  {  {
    1544   int slen;   int slen;
    1545    
    1546   if (!s && !s[0])   if (!s || !s[0])
    1547   return 0;   return 0;
    1548   slen = strlen(s) - 1;   slen = strlen(s) - 1;
    1549    
    # Line 1653  struct singleEntry * findEntryByPath(str Line 1732  struct singleEntry * findEntryByPath(str
    1732    
    1733   if (!strncmp(kernel, "TITLE=", 6)) {   if (!strncmp(kernel, "TITLE=", 6)) {
    1734      prefix = "";      prefix = "";
    1735      checkType = LT_TITLE;      checkType = LT_TITLE|LT_MENUENTRY;
    1736      kernel += 6;      kernel += 6;
    1737   }   }
    1738    
    # Line 1669  struct singleEntry * findEntryByPath(str Line 1748  struct singleEntry * findEntryByPath(str
    1748       checkType, line);       checkType, line);
    1749   if (!line) break;  /* not found in this entry */   if (!line) break;  /* not found in this entry */
    1750    
    1751   if (line && line->numElements >= 2) {   if (line && line->type != LT_MENUENTRY &&
    1752     line->numElements >= 2) {
    1753      rootspec = getRootSpecifier(line->elements[1].item);      rootspec = getRootSpecifier(line->elements[1].item);
    1754      if (!strcmp(line->elements[1].item +      if (!strcmp(line->elements[1].item +
    1755   ((rootspec != NULL) ? strlen(rootspec) : 0),   ((rootspec != NULL) ? strlen(rootspec) : 0),
    1756   kernel + strlen(prefix)))   kernel + strlen(prefix)))
    1757   break;   break;
    1758   }   }
    1759     if(line->type == LT_MENUENTRY &&
    1760     !strcmp(line->elements[1].item, kernel))
    1761        break;
    1762      }      }
    1763    
    1764      /* make sure this entry has a kernel identifier; this skips      /* make sure this entry has a kernel identifier; this skips
    # Line 1767  void markRemovedImage(struct grubConfig Line 1850  void markRemovedImage(struct grubConfig
    1850        const char * prefix) {        const char * prefix) {
    1851      struct singleEntry * entry;      struct singleEntry * entry;
    1852    
    1853      if (!image) return;      if (!image)
    1854     return;
    1855    
    1856        /* check and see if we're removing the default image */
    1857        if (isdigit(*image)) {
    1858     entry = findEntryByPath(cfg, image, prefix, NULL);
    1859     if(entry)
    1860        entry->skip = 1;
    1861     return;
    1862        }
    1863    
    1864      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))
    1865   entry->skip = 1;   entry->skip = 1;
    # Line 1775  void markRemovedImage(struct grubConfig Line 1867  void markRemovedImage(struct grubConfig
    1867    
    1868  void setDefaultImage(struct grubConfig * config, int hasNew,  void setDefaultImage(struct grubConfig * config, int hasNew,
    1869       const char * defaultKernelPath, int newIsDefault,       const char * defaultKernelPath, int newIsDefault,
    1870       const char * prefix, int flags) {       const char * prefix, int flags, int index) {
    1871      struct singleEntry * entry, * entry2, * newDefault;      struct singleEntry * entry, * entry2, * newDefault;
    1872      int i, j;      int i, j;
    1873    
    1874      if (newIsDefault) {      if (newIsDefault) {
    1875   config->defaultImage = 0;   config->defaultImage = 0;
    1876   return;   return;
    1877        } else if ((index >= 0) && config->cfi->defaultIsIndex) {
    1878     if (findEntryByIndex(config, index))
    1879        config->defaultImage = index;
    1880     else
    1881        config->defaultImage = -1;
    1882     return;
    1883      } else if (defaultKernelPath) {      } else if (defaultKernelPath) {
    1884   i = 0;   i = 0;
    1885   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {
    # Line 1862  void displayEntry(struct singleEntry * e Line 1960  void displayEntry(struct singleEntry * e
    1960          return;          return;
    1961      }      }
    1962    
    1963      printf("kernel=%s%s\n", prefix, line->elements[1].item);      if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    1964     printf("kernel=%s\n", line->elements[1].item);
    1965        else
    1966     printf("kernel=%s%s\n", prefix, line->elements[1].item);
    1967    
    1968      if (line->numElements >= 3) {      if (line->numElements >= 3) {
    1969   printf("args=\"");   printf("args=\"");
    # Line 1921  void displayEntry(struct singleEntry * e Line 2022  void displayEntry(struct singleEntry * e
    2022      line = getLineByType(LT_INITRD, entry->lines);      line = getLineByType(LT_INITRD, entry->lines);
    2023    
    2024      if (line && line->numElements >= 2) {      if (line && line->numElements >= 2) {
    2025   printf("initrd=%s", prefix);   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    2026        printf("initrd=");
    2027     else
    2028        printf("initrd=%s", prefix);
    2029    
    2030   for (i = 1; i < line->numElements; i++)   for (i = 1; i < line->numElements; i++)
    2031      printf("%s%s", line->elements[i].item, line->elements[i].indent);      printf("%s%s", line->elements[i].item, line->elements[i].indent);
    2032   printf("\n");   printf("\n");
    2033      }      }
    2034    
    2035        line = getLineByType(LT_TITLE, entry->lines);
    2036        if (line) {
    2037     printf("title=%s\n", line->elements[1].item);
    2038        } else {
    2039     char * title;
    2040     line = getLineByType(LT_MENUENTRY, entry->lines);
    2041     title = grub2ExtractTitle(line);
    2042     if (title)
    2043        printf("title=%s\n", title);
    2044        }
    2045    }
    2046    
    2047    int isSuseSystem(void) {
    2048        const char * path;
    2049        const static char default_path[] = "/etc/SuSE-release";
    2050    
    2051        if ((path = getenv("GRUBBY_SUSE_RELEASE")) == NULL)
    2052     path = default_path;
    2053    
    2054        if (!access(path, R_OK))
    2055     return 1;
    2056        return 0;
    2057    }
    2058    
    2059    int isSuseGrubConf(const char * path) {
    2060        FILE * grubConf;
    2061        char * line = NULL;
    2062        size_t len = 0, res = 0;
    2063    
    2064        grubConf = fopen(path, "r");
    2065        if (!grubConf) {
    2066            dbgPrintf("Could not open SuSE configuration file '%s'\n", path);
    2067     return 0;
    2068        }
    2069    
    2070        while ((res = getline(&line, &len, grubConf)) != -1) {
    2071     if (!strncmp(line, "setup", 5)) {
    2072        fclose(grubConf);
    2073        free(line);
    2074        return 1;
    2075     }
    2076        }
    2077    
    2078        dbgPrintf("SuSE configuration file '%s' does not appear to be valid\n",
    2079          path);
    2080    
    2081        fclose(grubConf);
    2082        free(line);
    2083        return 0;
    2084    }
    2085    
    2086    int suseGrubConfGetLba(const char * path, int * lbaPtr) {
    2087        FILE * grubConf;
    2088        char * line = NULL;
    2089        size_t res = 0, len = 0;
    2090    
    2091        if (!path) return 1;
    2092        if (!lbaPtr) return 1;
    2093    
    2094        grubConf = fopen(path, "r");
    2095        if (!grubConf) return 1;
    2096    
    2097        while ((res = getline(&line, &len, grubConf)) != -1) {
    2098     if (line[res - 1] == '\n')
    2099        line[res - 1] = '\0';
    2100     else if (len > res)
    2101        line[res] = '\0';
    2102     else {
    2103        line = realloc(line, res + 1);
    2104        line[res] = '\0';
    2105     }
    2106    
    2107     if (!strncmp(line, "setup", 5)) {
    2108        if (strstr(line, "--force-lba")) {
    2109            *lbaPtr = 1;
    2110        } else {
    2111            *lbaPtr = 0;
    2112        }
    2113        dbgPrintf("lba: %i\n", *lbaPtr);
    2114        break;
    2115     }
    2116        }
    2117    
    2118        free(line);
    2119        fclose(grubConf);
    2120        return 0;
    2121    }
    2122    
    2123    int suseGrubConfGetInstallDevice(const char * path, char ** devicePtr) {
    2124        FILE * grubConf;
    2125        char * line = NULL;
    2126        size_t res = 0, len = 0;
    2127        char * lastParamPtr = NULL;
    2128        char * secLastParamPtr = NULL;
    2129        char installDeviceNumber = '\0';
    2130        char * bounds = NULL;
    2131    
    2132        if (!path) return 1;
    2133        if (!devicePtr) return 1;
    2134    
    2135        grubConf = fopen(path, "r");
    2136        if (!grubConf) return 1;
    2137    
    2138        while ((res = getline(&line, &len, grubConf)) != -1) {
    2139     if (strncmp(line, "setup", 5))
    2140        continue;
    2141    
    2142     if (line[res - 1] == '\n')
    2143        line[res - 1] = '\0';
    2144     else if (len > res)
    2145        line[res] = '\0';
    2146     else {
    2147        line = realloc(line, res + 1);
    2148        line[res] = '\0';
    2149     }
    2150    
    2151     lastParamPtr = bounds = line + res;
    2152    
    2153     /* Last parameter in grub may be an optional IMAGE_DEVICE */
    2154     while (!isspace(*lastParamPtr))
    2155        lastParamPtr--;
    2156     lastParamPtr++;
    2157    
    2158     secLastParamPtr = lastParamPtr - 2;
    2159     dbgPrintf("lastParamPtr: %s\n", lastParamPtr);
    2160    
    2161     if (lastParamPtr + 3 > bounds) {
    2162        dbgPrintf("lastParamPtr going over boundary");
    2163        fclose(grubConf);
    2164        free(line);
    2165        return 1;
    2166     }
    2167     if (!strncmp(lastParamPtr, "(hd", 3))
    2168        lastParamPtr += 3;
    2169     dbgPrintf("lastParamPtr: %c\n", *lastParamPtr);
    2170    
    2171     /*
    2172     * Second last parameter will decide wether last parameter is
    2173     * an IMAGE_DEVICE or INSTALL_DEVICE
    2174     */
    2175     while (!isspace(*secLastParamPtr))
    2176        secLastParamPtr--;
    2177     secLastParamPtr++;
    2178    
    2179     if (secLastParamPtr + 3 > bounds) {
    2180        dbgPrintf("secLastParamPtr going over boundary");
    2181        fclose(grubConf);
    2182        free(line);
    2183        return 1;
    2184     }
    2185     dbgPrintf("secLastParamPtr: %s\n", secLastParamPtr);
    2186     if (!strncmp(secLastParamPtr, "(hd", 3)) {
    2187        secLastParamPtr += 3;
    2188        dbgPrintf("secLastParamPtr: %c\n", *secLastParamPtr);
    2189        installDeviceNumber = *secLastParamPtr;
    2190     } else {
    2191        installDeviceNumber = *lastParamPtr;
    2192     }
    2193    
    2194     *devicePtr = malloc(6);
    2195     snprintf(*devicePtr, 6, "(hd%c)", installDeviceNumber);
    2196     dbgPrintf("installDeviceNumber: %c\n", installDeviceNumber);
    2197     fclose(grubConf);
    2198     free(line);
    2199     return 0;
    2200        }
    2201    
    2202        free(line);
    2203        fclose(grubConf);
    2204        return 1;
    2205    }
    2206    
    2207    int grubGetBootFromDeviceMap(const char * device,
    2208         char ** bootPtr) {
    2209        FILE * deviceMap;
    2210        char * line = NULL;
    2211        size_t res = 0, len = 0;
    2212        char * devicePtr;
    2213        char * bounds = NULL;
    2214        const char * path;
    2215        const static char default_path[] = "/boot/grub/device.map";
    2216    
    2217        if (!device) return 1;
    2218        if (!bootPtr) return 1;
    2219    
    2220        if ((path = getenv("GRUBBY_GRUB_DEVICE_MAP")) == NULL)
    2221     path = default_path;
    2222    
    2223        dbgPrintf("opening grub device.map file from: %s\n", path);
    2224        deviceMap = fopen(path, "r");
    2225        if (!deviceMap)
    2226     return 1;
    2227    
    2228        while ((res = getline(&line, &len, deviceMap)) != -1) {
    2229            if (!strncmp(line, "#", 1))
    2230        continue;
    2231    
    2232     if (line[res - 1] == '\n')
    2233        line[res - 1] = '\0';
    2234     else if (len > res)
    2235        line[res] = '\0';
    2236     else {
    2237        line = realloc(line, res + 1);
    2238        line[res] = '\0';
    2239     }
    2240    
    2241     devicePtr = line;
    2242     bounds = line + res;
    2243    
    2244     while ((isspace(*line) && ((devicePtr + 1) <= bounds)))
    2245        devicePtr++;
    2246     dbgPrintf("device: %s\n", devicePtr);
    2247    
    2248     if (!strncmp(devicePtr, device, strlen(device))) {
    2249        devicePtr += strlen(device);
    2250        while (isspace(*devicePtr) && ((devicePtr + 1) <= bounds))
    2251            devicePtr++;
    2252    
    2253        *bootPtr = strdup(devicePtr);
    2254        break;
    2255     }
    2256        }
    2257    
    2258        free(line);
    2259        fclose(deviceMap);
    2260        return 0;
    2261    }
    2262    
    2263    int suseGrubConfGetBoot(const char * path, char ** bootPtr) {
    2264        char * grubDevice;
    2265    
    2266        if (suseGrubConfGetInstallDevice(path, &grubDevice))
    2267     dbgPrintf("error looking for grub installation device\n");
    2268        else
    2269     dbgPrintf("grubby installation device: %s\n", grubDevice);
    2270    
    2271        if (grubGetBootFromDeviceMap(grubDevice, bootPtr))
    2272     dbgPrintf("error looking for grub boot device\n");
    2273        else
    2274     dbgPrintf("grubby boot device: %s\n", *bootPtr);
    2275    
    2276        free(grubDevice);
    2277        return 0;
    2278    }
    2279    
    2280    int parseSuseGrubConf(int * lbaPtr, char ** bootPtr) {
    2281        /*
    2282         * This SuSE grub configuration file at this location is not your average
    2283         * grub configuration file, but instead the grub commands used to setup
    2284         * grub on that system.
    2285         */
    2286        const char * path;
    2287        const static char default_path[] = "/etc/grub.conf";
    2288    
    2289        if ((path = getenv("GRUBBY_SUSE_GRUB_CONF")) == NULL)
    2290     path = default_path;
    2291    
    2292        if (!isSuseGrubConf(path)) return 1;
    2293    
    2294        if (lbaPtr) {
    2295            *lbaPtr = 0;
    2296            if (suseGrubConfGetLba(path, lbaPtr))
    2297                return 1;
    2298        }
    2299    
    2300        if (bootPtr) {
    2301            *bootPtr = NULL;
    2302            suseGrubConfGetBoot(path, bootPtr);
    2303        }
    2304    
    2305        return 0;
    2306  }  }
    2307    
    2308  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {
    # Line 1976  int parseSysconfigGrub(int * lbaPtr, cha Line 2353  int parseSysconfigGrub(int * lbaPtr, cha
    2353  }  }
    2354    
    2355  void dumpSysconfigGrub(void) {  void dumpSysconfigGrub(void) {
    2356      char * boot;      char * boot = NULL;
    2357      int lba;      int lba;
    2358    
    2359      if (!parseSysconfigGrub(&lba, &boot)) {      if (isSuseSystem()) {
    2360   if (lba) printf("lba\n");          if (parseSuseGrubConf(&lba, &boot)) {
    2361   if (boot) printf("boot=%s\n", boot);      free(boot);
    2362        return;
    2363     }
    2364        } else {
    2365            if (parseSysconfigGrub(&lba, &boot)) {
    2366        free(boot);
    2367        return;
    2368     }
    2369        }
    2370    
    2371        if (lba) printf("lba\n");
    2372        if (boot) {
    2373     printf("boot=%s\n", boot);
    2374     free(boot);
    2375      }      }
    2376  }  }
    2377    
    # Line 2180  void removeLine(struct singleEntry * ent Line 2570  void removeLine(struct singleEntry * ent
    2570      free(line);      free(line);
    2571  }  }
    2572    
     static int isquote(char q)  
     {  
         if (q == '\'' || q == '\"')  
      return 1;  
         return 0;  
     }  
       
    2573  static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)  static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)
    2574  {  {
    2575      struct singleLine newLine = {      struct singleLine newLine = {
    # Line 2802  int checkForGrub(struct grubConfig * con Line 3185  int checkForGrub(struct grubConfig * con
    3185      int fd;      int fd;
    3186      unsigned char bootSect[512];      unsigned char bootSect[512];
    3187      char * boot;      char * boot;
    3188        int onSuse = isSuseSystem();
    3189    
    3190      if (parseSysconfigGrub(NULL, &boot))  
    3191   return 0;      if (onSuse) {
    3192     if (parseSuseGrubConf(NULL, &boot))
    3193        return 0;
    3194        } else {
    3195     if (parseSysconfigGrub(NULL, &boot))
    3196        return 0;
    3197        }
    3198    
    3199      /* assume grub is not installed -- not an error condition */      /* assume grub is not installed -- not an error condition */
    3200      if (!boot)      if (!boot)
    # Line 2823  int checkForGrub(struct grubConfig * con Line 3213  int checkForGrub(struct grubConfig * con
    3213      }      }
    3214      close(fd);      close(fd);
    3215    
    3216        /* The more elaborate checks do not work on SuSE. The checks done
    3217         * seem to be reasonble (at least for now), so just return success
    3218         */
    3219        if (onSuse)
    3220     return 2;
    3221    
    3222      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
    3223  }  }
    3224    
    # Line 2856  int checkForExtLinux(struct grubConfig * Line 3252  int checkForExtLinux(struct grubConfig *
    3252      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
    3253  }  }
    3254    
    3255    int checkForYaboot(struct grubConfig * config) {
    3256        /*
    3257         * This is a simplistic check that we consider good enough for own puporses
    3258         *
    3259         * If we were to properly check if yaboot is *installed* we'd need to:
    3260         * 1) get the system boot device (LT_BOOT)
    3261         * 2) considering it's a raw filesystem, check if the yaboot binary matches
    3262         *    the content on the boot device
    3263         * 3) if not, copy the binary to a temporary file and run "addnote" on it
    3264         * 4) check again if binary and boot device contents match
    3265         */
    3266        if (!access("/etc/yaboot.conf", R_OK))
    3267     return 2;
    3268    
    3269        return 1;
    3270    }
    3271    
    3272    int checkForElilo(struct grubConfig * config) {
    3273        if (!access("/etc/elilo.conf", R_OK))
    3274     return 2;
    3275    
    3276        return 1;
    3277    }
    3278    
    3279  static char * getRootSpecifier(char * str) {  static char * getRootSpecifier(char * str) {
    3280      char * idx, * rootspec = NULL;      char * idx, * rootspec = NULL;
    3281    
    # Line 2870  static char * getRootSpecifier(char * st Line 3290  static char * getRootSpecifier(char * st
    3290  static char * getInitrdVal(struct grubConfig * config,  static char * getInitrdVal(struct grubConfig * config,
    3291     const char * prefix, struct singleLine *tmplLine,     const char * prefix, struct singleLine *tmplLine,
    3292     const char * newKernelInitrd,     const char * newKernelInitrd,
    3293     char ** extraInitrds, int extraInitrdCount)     const char ** extraInitrds, int extraInitrdCount)
    3294  {  {
    3295      char *initrdVal, *end;      char *initrdVal, *end;
    3296      int i;      int i;
    # Line 2915  static char * getInitrdVal(struct grubCo Line 3335  static char * getInitrdVal(struct grubCo
    3335    
    3336  int addNewKernel(struct grubConfig * config, struct singleEntry * template,  int addNewKernel(struct grubConfig * config, struct singleEntry * template,
    3337           const char * prefix,           const char * prefix,
    3338   char * newKernelPath, char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
    3339   char * newKernelArgs, char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
    3340   char ** extraInitrds, int extraInitrdCount,   const char ** extraInitrds, int extraInitrdCount,
    3341                   char * newMBKernel, char * newMBKernelArgs) {                   const char * newMBKernel, const char * newMBKernelArgs) {
    3342      struct singleEntry * new;      struct singleEntry * new;
    3343      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
    3344      int needs;      int needs;
    # Line 3326  int main(int argc, const char ** argv) { Line 3746  int main(int argc, const char ** argv) {
    3746      int displayDefault = 0;      int displayDefault = 0;
    3747      int displayDefaultIndex = 0;      int displayDefaultIndex = 0;
    3748      int displayDefaultTitle = 0;      int displayDefaultTitle = 0;
    3749        int defaultIndex = -1;
    3750      struct poptOption options[] = {      struct poptOption options[] = {
    3751   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,
    3752      _("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 3764  int main(int argc, const char ** argv) {
    3764   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
    3765      _("filestystem which contains /boot directory (for testing only)"),      _("filestystem which contains /boot directory (for testing only)"),
    3766      _("bootfs") },      _("bootfs") },
    3767  #if defined(__i386__) || defined(__x86_64__)  #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
    3768   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
    3769      _("check if lilo is installed on lilo.conf boot sector") },      _("check which bootloader is installed on boot sector") },
    3770  #endif  #endif
    3771   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,
    3772      _("path to grub config file to update (\"-\" for stdin)"),      _("path to grub config file to update (\"-\" for stdin)"),
    # Line 3398  int main(int argc, const char ** argv) { Line 3819  int main(int argc, const char ** argv) {
    3819   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,
    3820      _("make the first entry referencing the specified kernel "      _("make the first entry referencing the specified kernel "
    3821        "the default"), _("kernel-path") },        "the default"), _("kernel-path") },
    3822     { "set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,
    3823        _("make the given entry index the default entry"),
    3824        _("entry-index") },
    3825   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,
    3826      _("configure silo bootloader") },      _("configure silo bootloader") },
    3827   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,
    # Line 3480  int main(int argc, const char ** argv) { Line 3904  int main(int argc, const char ** argv) {
    3904      }      }
    3905    
    3906      if (!cfi) {      if (!cfi) {
    3907            if (grub2FindConfig(&grub2ConfigType))
    3908        cfi = &grub2ConfigType;
    3909     else
    3910        #ifdef __ia64__        #ifdef __ia64__
    3911   cfi = &eliloConfigType;      cfi = &eliloConfigType;
    3912        #elif __powerpc__        #elif __powerpc__
    3913   cfi = &yabootConfigType;      cfi = &yabootConfigType;
    3914        #elif __sparc__        #elif __sparc__
    3915          cfi = &siloConfigType;              cfi = &siloConfigType;
    3916        #elif __s390__        #elif __s390__
    3917          cfi = &ziplConfigType;              cfi = &ziplConfigType;
    3918        #elif __s390x__        #elif __s390x__
    3919          cfi = &ziplConfigtype;              cfi = &ziplConfigtype;
    3920        #else        #else
             if (grub2FindConfig(&grub2ConfigType))  
         cfi = &grub2ConfigType;  
      else  
    3921      cfi = &grubConfigType;      cfi = &grubConfigType;
    3922        #endif        #endif
    3923      }      }
    # Line 3506  int main(int argc, const char ** argv) { Line 3930  int main(int argc, const char ** argv) {
    3930      }      }
    3931    
    3932      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||
    3933    newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
    3934    defaultKernel || displayDefaultIndex || displayDefaultTitle)) {      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
    3935        (defaultIndex >= 0))) {
    3936   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
    3937    "specified option"));    "specified option"));
    3938   return 1;   return 1;
    # Line 3549  int main(int argc, const char ** argv) { Line 3974  int main(int argc, const char ** argv) {
    3974   makeDefault = 1;   makeDefault = 1;
    3975   defaultKernel = NULL;   defaultKernel = NULL;
    3976      }      }
    3977        else if (defaultKernel && (defaultIndex >= 0)) {
    3978     fprintf(stderr, _("grubby: --set-default and --set-default-index "
    3979      "may not be used together\n"));
    3980     return 1;
    3981        }
    3982    
    3983      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {
    3984   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 3987  int main(int argc, const char ** argv) {
    3987      }      }
    3988    
    3989      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
    3990   && !kernelInfo && !bootloaderProbe && !updateKernelPath   && !kernelInfo && !bootloaderProbe && !updateKernelPath
    3991          && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle) {   && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle
    3992     && (defaultIndex == -1)) {
    3993   fprintf(stderr, _("grubby: no action specified\n"));   fprintf(stderr, _("grubby: no action specified\n"));
    3994   return 1;   return 1;
    3995      }      }
    # Line 3585  int main(int argc, const char ** argv) { Line 4016  int main(int argc, const char ** argv) {
    4016      }      }
    4017    
    4018      if (bootloaderProbe) {      if (bootloaderProbe) {
    4019   int lrc = 0, grc = 0, gr2c = 0, erc = 0;   int lrc = 0, grc = 0, gr2c = 0, extrc = 0, yrc = 0, erc = 0;
    4020   struct grubConfig * lconfig, * gconfig;   struct grubConfig * lconfig, * gconfig, * yconfig, * econfig;
    4021    
    4022   const char *grub2config = grub2FindConfig(&grub2ConfigType);   const char *grub2config = grub2FindConfig(&grub2ConfigType);
    4023   if (grub2config) {   if (grub2config) {
    # Line 3614  int main(int argc, const char ** argv) { Line 4045  int main(int argc, const char ** argv) {
    4045   lrc = checkForLilo(lconfig);   lrc = checkForLilo(lconfig);
    4046   }   }
    4047    
    4048     if (!access(eliloConfigType.defaultConfig, F_OK)) {
    4049        econfig = readConfig(eliloConfigType.defaultConfig,
    4050     &eliloConfigType);
    4051        if (!econfig)
    4052     erc = 1;
    4053        else
    4054     erc = checkForElilo(econfig);
    4055     }
    4056    
    4057   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {
    4058      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);
    4059      if (!lconfig)      if (!lconfig)
    4060   erc = 1;   extrc = 1;
    4061      else      else
    4062   erc = checkForExtLinux(lconfig);   extrc = checkForExtLinux(lconfig);
    4063   }   }
    4064    
    4065   if (lrc == 1 || grc == 1 || gr2c == 1) return 1;  
    4066     if (!access(yabootConfigType.defaultConfig, F_OK)) {
    4067        yconfig = readConfig(yabootConfigType.defaultConfig,
    4068     &yabootConfigType);
    4069        if (!yconfig)
    4070     yrc = 1;
    4071        else
    4072     yrc = checkForYaboot(yconfig);
    4073     }
    4074    
    4075     if (lrc == 1 || grc == 1 || gr2c == 1 || extrc == 1 || yrc == 1 ||
    4076     erc == 1)
    4077        return 1;
    4078    
    4079   if (lrc == 2) printf("lilo\n");   if (lrc == 2) printf("lilo\n");
    4080   if (gr2c == 2) printf("grub2\n");   if (gr2c == 2) printf("grub2\n");
    4081   if (grc == 2) printf("grub\n");   if (grc == 2) printf("grub\n");
    4082   if (erc == 2) printf("extlinux\n");   if (extrc == 2) printf("extlinux\n");
    4083     if (yrc == 2) printf("yaboot\n");
    4084     if (erc == 2) printf("elilo\n");
    4085    
    4086   return 0;   return 0;
    4087      }      }
    # Line 3694  int main(int argc, const char ** argv) { Line 4148  int main(int argc, const char ** argv) {
    4148      markRemovedImage(config, removeKernelPath, bootPrefix);      markRemovedImage(config, removeKernelPath, bootPrefix);
    4149      markRemovedImage(config, removeMBKernel, bootPrefix);      markRemovedImage(config, removeMBKernel, bootPrefix);
    4150      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,
    4151      bootPrefix, flags);      bootPrefix, flags, defaultIndex);
    4152      setFallbackImage(config, newKernelPath != NULL);      setFallbackImage(config, newKernelPath != NULL);
    4153      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
    4154                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
    # Line 3704  int main(int argc, const char ** argv) { Line 4158  int main(int argc, const char ** argv) {
    4158      }      }
    4159      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
    4160                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
    4161                       extraInitrds, extraInitrdCount,                       (const char **)extraInitrds, extraInitrdCount,
    4162                       newMBKernel, newMBKernelArgs)) return 1;                       newMBKernel, newMBKernelArgs)) return 1;
    4163            
    4164    
    Legend:
    Removed from v.1748  
    changed lines
      Added in v.1864