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 1868 by niro, Mon Jul 2 13:22:30 2012 UTC
    # Line 114  struct singleEntry { Line 114  struct singleEntry {
    114    
    115  #define MAIN_DEFAULT    (1 << 0)  #define MAIN_DEFAULT    (1 << 0)
    116  #define DEFAULT_SAVED       -2  #define DEFAULT_SAVED       -2
    117    #define DEFAULT_SAVED_GRUB2 -3
    118    
    119  struct keywordTypes {  struct keywordTypes {
    120      char * key;      char * key;
    # Line 163  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 242  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 264  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 280  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 = {
    330      .findConfig = grub2FindConfig,      .findConfig = grub2FindConfig,
    331      .keywords = grub2Keywords,      .keywords = grub2Keywords,
    332      .defaultIsIndex = 1,      .defaultIsIndex = 1,
    333      .defaultSupportSaved = 0,      .defaultSupportSaved = 1,
    334      .defaultIsVariable = 1,      .defaultIsVariable = 1,
    335      .entryStart = LT_MENUENTRY,      .entryStart = LT_MENUENTRY,
    336      .entryEnd = LT_ENTRY_END,      .entryEnd = LT_ENTRY_END,
    # Line 570  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 601  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 689  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 699  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 708  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 723  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 821  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 833  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 852  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 873  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 886  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 913  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 976  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 1007  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 1028  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 1049  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 1058  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 1123  static struct grubConfig * readConfig(co Line 1187  static struct grubConfig * readConfig(co
    1187    
    1188      dbgPrintf("defaultLine is %s\n", defaultLine ? "set" : "unset");      dbgPrintf("defaultLine is %s\n", defaultLine ? "set" : "unset");
    1189      if (defaultLine) {      if (defaultLine) {
    1190   if (cfi->defaultIsVariable) {          if (defaultLine->numElements > 2 &&
    1191        cfi->defaultSupportSaved &&
    1192        !strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {
    1193        cfg->defaultImage = DEFAULT_SAVED_GRUB2;
    1194     } else if (cfi->defaultIsVariable) {
    1195      char *value = defaultLine->elements[2].item;      char *value = defaultLine->elements[2].item;
    1196      while (*value && (*value == '"' || *value == '\'' ||      while (*value && (*value == '"' || *value == '\'' ||
    1197      *value == ' ' || *value == '\t'))      *value == ' ' || *value == '\t'))
    # Line 1140  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 1180  static void writeDefault(FILE * out, cha Line 1248  static void writeDefault(FILE * out, cha
    1248    
    1249      if (cfg->defaultImage == DEFAULT_SAVED)      if (cfg->defaultImage == DEFAULT_SAVED)
    1250   fprintf(out, "%sdefault%ssaved\n", indent, separator);   fprintf(out, "%sdefault%ssaved\n", indent, separator);
    1251        else if (cfg->defaultImage == DEFAULT_SAVED_GRUB2)
    1252     fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
    1253      else if (cfg->defaultImage > -1) {      else if (cfg->defaultImage > -1) {
    1254   if (cfg->cfi->defaultIsIndex) {   if (cfg->cfi->defaultIsIndex) {
    1255      if (cfg->cfi->defaultIsVariable) {      if (cfg->cfi->defaultIsVariable) {
    # Line 1240  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)));      char *dir = strdupa(outName);
    1314                rc = chdir(dirname(dir));
    1315        free(dir);
    1316      do {      do {
    1317   buf = alloca(len + 1);   buf = alloca(len + 1);
    1318   rc = readlink(basename(outName), buf, len);   rc = readlink(basename(outName), buf, len);
    # Line 1378  static char *findDiskForRoot() Line 1450  static char *findDiskForRoot()
    1450      buf[rc] = '\0';      buf[rc] = '\0';
    1451      chptr = buf;      chptr = buf;
    1452    
    1453        char *foundanswer = NULL;
    1454    
    1455      while (chptr && chptr != buf+rc) {      while (chptr && chptr != buf+rc) {
    1456          devname = chptr;          devname = chptr;
    1457    
    # Line 1405  static char *findDiskForRoot() Line 1479  static char *findDiskForRoot()
    1479           * for '/' obviously.           * for '/' obviously.
    1480           */           */
    1481          if (*(++chptr) == '/' && *(++chptr) == ' ') {          if (*(++chptr) == '/' && *(++chptr) == ' ') {
    1482              /*              /* remember the last / entry in mtab */
    1483               * 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);  
    1484          }          }
    1485    
    1486          /* Next line */          /* Next line */
    # Line 1420  static char *findDiskForRoot() Line 1489  static char *findDiskForRoot()
    1489              chptr++;              chptr++;
    1490      }      }
    1491    
    1492        /* Return the last / entry found */
    1493        if (foundanswer) {
    1494            chptr = strchr(foundanswer, ' ');
    1495            *chptr = '\0';
    1496            return strdup(foundanswer);
    1497        }
    1498    
    1499      return NULL;      return NULL;
    1500  }  }
    1501    
    # Line 1430  void printEntry(struct singleEntry * ent Line 1506  void printEntry(struct singleEntry * ent
    1506      for (line = entry->lines; line; line = line->next) {      for (line = entry->lines; line; line = line->next) {
    1507   fprintf(stderr, "DBG: %s", line->indent);   fprintf(stderr, "DBG: %s", line->indent);
    1508   for (i = 0; i < line->numElements; i++) {   for (i = 0; i < line->numElements; i++) {
    1509   fprintf(stderr, "%s%s",      /* Need to handle this, because we strip the quotes from
    1510         * menuentry when read it. */
    1511        if (line->type == LT_MENUENTRY && i == 1) {
    1512     if(!isquote(*line->elements[i].item))
    1513        fprintf(stderr, "\'%s\'", line->elements[i].item);
    1514     else
    1515        fprintf(stderr, "%s", line->elements[i].item);
    1516     fprintf(stderr, "%s", line->elements[i].indent);
    1517    
    1518     continue;
    1519        }
    1520        
    1521        fprintf(stderr, "%s%s",
    1522      line->elements[i].item, line->elements[i].indent);      line->elements[i].item, line->elements[i].indent);
    1523   }   }
    1524   fprintf(stderr, "\n");   fprintf(stderr, "\n");
    # Line 1457  static int endswith(const char *s, char Line 1545  static int endswith(const char *s, char
    1545  {  {
    1546   int slen;   int slen;
    1547    
    1548   if (!s && !s[0])   if (!s || !s[0])
    1549   return 0;   return 0;
    1550   slen = strlen(s) - 1;   slen = strlen(s) - 1;
    1551    
    # Line 1646  struct singleEntry * findEntryByPath(str Line 1734  struct singleEntry * findEntryByPath(str
    1734    
    1735   if (!strncmp(kernel, "TITLE=", 6)) {   if (!strncmp(kernel, "TITLE=", 6)) {
    1736      prefix = "";      prefix = "";
    1737      checkType = LT_TITLE;      checkType = LT_TITLE|LT_MENUENTRY;
    1738      kernel += 6;      kernel += 6;
    1739   }   }
    1740    
    # Line 1662  struct singleEntry * findEntryByPath(str Line 1750  struct singleEntry * findEntryByPath(str
    1750       checkType, line);       checkType, line);
    1751   if (!line) break;  /* not found in this entry */   if (!line) break;  /* not found in this entry */
    1752    
    1753   if (line && line->numElements >= 2) {   if (line && line->type != LT_MENUENTRY &&
    1754     line->numElements >= 2) {
    1755      rootspec = getRootSpecifier(line->elements[1].item);      rootspec = getRootSpecifier(line->elements[1].item);
    1756      if (!strcmp(line->elements[1].item +      if (!strcmp(line->elements[1].item +
    1757   ((rootspec != NULL) ? strlen(rootspec) : 0),   ((rootspec != NULL) ? strlen(rootspec) : 0),
    1758   kernel + strlen(prefix)))   kernel + strlen(prefix)))
    1759   break;   break;
    1760   }   }
    1761     if(line->type == LT_MENUENTRY &&
    1762     !strcmp(line->elements[1].item, kernel))
    1763        break;
    1764      }      }
    1765    
    1766      /* make sure this entry has a kernel identifier; this skips      /* make sure this entry has a kernel identifier; this skips
    # Line 1760  void markRemovedImage(struct grubConfig Line 1852  void markRemovedImage(struct grubConfig
    1852        const char * prefix) {        const char * prefix) {
    1853      struct singleEntry * entry;      struct singleEntry * entry;
    1854    
    1855      if (!image) return;      if (!image)
    1856     return;
    1857    
    1858        /* check and see if we're removing the default image */
    1859        if (isdigit(*image)) {
    1860     entry = findEntryByPath(cfg, image, prefix, NULL);
    1861     if(entry)
    1862        entry->skip = 1;
    1863     return;
    1864        }
    1865    
    1866      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))
    1867   entry->skip = 1;   entry->skip = 1;
    # Line 1768  void markRemovedImage(struct grubConfig Line 1869  void markRemovedImage(struct grubConfig
    1869    
    1870  void setDefaultImage(struct grubConfig * config, int hasNew,  void setDefaultImage(struct grubConfig * config, int hasNew,
    1871       const char * defaultKernelPath, int newIsDefault,       const char * defaultKernelPath, int newIsDefault,
    1872       const char * prefix, int flags) {       const char * prefix, int flags, int index) {
    1873      struct singleEntry * entry, * entry2, * newDefault;      struct singleEntry * entry, * entry2, * newDefault;
    1874      int i, j;      int i, j;
    1875    
    1876      if (newIsDefault) {      if (newIsDefault) {
    1877   config->defaultImage = 0;   config->defaultImage = 0;
    1878   return;   return;
    1879        } else if ((index >= 0) && config->cfi->defaultIsIndex) {
    1880     if (findEntryByIndex(config, index))
    1881        config->defaultImage = index;
    1882     else
    1883        config->defaultImage = -1;
    1884     return;
    1885      } else if (defaultKernelPath) {      } else if (defaultKernelPath) {
    1886   i = 0;   i = 0;
    1887   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {
    # Line 1787  void setDefaultImage(struct grubConfig * Line 1894  void setDefaultImage(struct grubConfig *
    1894    
    1895      /* 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
    1896         changes */         changes */
    1897      if (config->defaultImage == DEFAULT_SAVED)      if ((config->defaultImage == DEFAULT_SAVED) ||
    1898     (config->defaultImage == DEFAULT_SAVED_GRUB2))
    1899        /* default is set to saved, we don't want to change it */        /* default is set to saved, we don't want to change it */
    1900        return;        return;
    1901    
    # Line 1854  void displayEntry(struct singleEntry * e Line 1962  void displayEntry(struct singleEntry * e
    1962          return;          return;
    1963      }      }
    1964    
    1965      printf("kernel=%s\n", line->elements[1].item);      if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    1966     printf("kernel=%s\n", line->elements[1].item);
    1967        else
    1968     printf("kernel=%s%s\n", prefix, line->elements[1].item);
    1969    
    1970      if (line->numElements >= 3) {      if (line->numElements >= 3) {
    1971   printf("args=\"");   printf("args=\"");
    # Line 1913  void displayEntry(struct singleEntry * e Line 2024  void displayEntry(struct singleEntry * e
    2024      line = getLineByType(LT_INITRD, entry->lines);      line = getLineByType(LT_INITRD, entry->lines);
    2025    
    2026      if (line && line->numElements >= 2) {      if (line && line->numElements >= 2) {
    2027   printf("initrd=%s", prefix);   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    2028        printf("initrd=");
    2029     else
    2030        printf("initrd=%s", prefix);
    2031    
    2032   for (i = 1; i < line->numElements; i++)   for (i = 1; i < line->numElements; i++)
    2033      printf("%s%s", line->elements[i].item, line->elements[i].indent);      printf("%s%s", line->elements[i].item, line->elements[i].indent);
    2034   printf("\n");   printf("\n");
    2035      }      }
    2036    
    2037        line = getLineByType(LT_TITLE, entry->lines);
    2038        if (line) {
    2039     printf("title=%s\n", line->elements[1].item);
    2040        } else {
    2041     char * title;
    2042     line = getLineByType(LT_MENUENTRY, entry->lines);
    2043     title = grub2ExtractTitle(line);
    2044     if (title)
    2045        printf("title=%s\n", title);
    2046        }
    2047    }
    2048    
    2049    int isSuseSystem(void) {
    2050        const char * path;
    2051        const static char default_path[] = "/etc/SuSE-release";
    2052    
    2053        if ((path = getenv("GRUBBY_SUSE_RELEASE")) == NULL)
    2054     path = default_path;
    2055    
    2056        if (!access(path, R_OK))
    2057     return 1;
    2058        return 0;
    2059    }
    2060    
    2061    int isSuseGrubConf(const char * path) {
    2062        FILE * grubConf;
    2063        char * line = NULL;
    2064        size_t len = 0, res = 0;
    2065    
    2066        grubConf = fopen(path, "r");
    2067        if (!grubConf) {
    2068            dbgPrintf("Could not open SuSE configuration file '%s'\n", path);
    2069     return 0;
    2070        }
    2071    
    2072        while ((res = getline(&line, &len, grubConf)) != -1) {
    2073     if (!strncmp(line, "setup", 5)) {
    2074        fclose(grubConf);
    2075        free(line);
    2076        return 1;
    2077     }
    2078        }
    2079    
    2080        dbgPrintf("SuSE configuration file '%s' does not appear to be valid\n",
    2081          path);
    2082    
    2083        fclose(grubConf);
    2084        free(line);
    2085        return 0;
    2086    }
    2087    
    2088    int suseGrubConfGetLba(const char * path, int * lbaPtr) {
    2089        FILE * grubConf;
    2090        char * line = NULL;
    2091        size_t res = 0, len = 0;
    2092    
    2093        if (!path) return 1;
    2094        if (!lbaPtr) return 1;
    2095    
    2096        grubConf = fopen(path, "r");
    2097        if (!grubConf) return 1;
    2098    
    2099        while ((res = getline(&line, &len, grubConf)) != -1) {
    2100     if (line[res - 1] == '\n')
    2101        line[res - 1] = '\0';
    2102     else if (len > res)
    2103        line[res] = '\0';
    2104     else {
    2105        line = realloc(line, res + 1);
    2106        line[res] = '\0';
    2107     }
    2108    
    2109     if (!strncmp(line, "setup", 5)) {
    2110        if (strstr(line, "--force-lba")) {
    2111            *lbaPtr = 1;
    2112        } else {
    2113            *lbaPtr = 0;
    2114        }
    2115        dbgPrintf("lba: %i\n", *lbaPtr);
    2116        break;
    2117     }
    2118        }
    2119    
    2120        free(line);
    2121        fclose(grubConf);
    2122        return 0;
    2123    }
    2124    
    2125    int suseGrubConfGetInstallDevice(const char * path, char ** devicePtr) {
    2126        FILE * grubConf;
    2127        char * line = NULL;
    2128        size_t res = 0, len = 0;
    2129        char * lastParamPtr = NULL;
    2130        char * secLastParamPtr = NULL;
    2131        char installDeviceNumber = '\0';
    2132        char * bounds = NULL;
    2133    
    2134        if (!path) return 1;
    2135        if (!devicePtr) return 1;
    2136    
    2137        grubConf = fopen(path, "r");
    2138        if (!grubConf) return 1;
    2139    
    2140        while ((res = getline(&line, &len, grubConf)) != -1) {
    2141     if (strncmp(line, "setup", 5))
    2142        continue;
    2143    
    2144     if (line[res - 1] == '\n')
    2145        line[res - 1] = '\0';
    2146     else if (len > res)
    2147        line[res] = '\0';
    2148     else {
    2149        line = realloc(line, res + 1);
    2150        line[res] = '\0';
    2151     }
    2152    
    2153     lastParamPtr = bounds = line + res;
    2154    
    2155     /* Last parameter in grub may be an optional IMAGE_DEVICE */
    2156     while (!isspace(*lastParamPtr))
    2157        lastParamPtr--;
    2158     lastParamPtr++;
    2159    
    2160     secLastParamPtr = lastParamPtr - 2;
    2161     dbgPrintf("lastParamPtr: %s\n", lastParamPtr);
    2162    
    2163     if (lastParamPtr + 3 > bounds) {
    2164        dbgPrintf("lastParamPtr going over boundary");
    2165        fclose(grubConf);
    2166        free(line);
    2167        return 1;
    2168     }
    2169     if (!strncmp(lastParamPtr, "(hd", 3))
    2170        lastParamPtr += 3;
    2171     dbgPrintf("lastParamPtr: %c\n", *lastParamPtr);
    2172    
    2173     /*
    2174     * Second last parameter will decide wether last parameter is
    2175     * an IMAGE_DEVICE or INSTALL_DEVICE
    2176     */
    2177     while (!isspace(*secLastParamPtr))
    2178        secLastParamPtr--;
    2179     secLastParamPtr++;
    2180    
    2181     if (secLastParamPtr + 3 > bounds) {
    2182        dbgPrintf("secLastParamPtr going over boundary");
    2183        fclose(grubConf);
    2184        free(line);
    2185        return 1;
    2186     }
    2187     dbgPrintf("secLastParamPtr: %s\n", secLastParamPtr);
    2188     if (!strncmp(secLastParamPtr, "(hd", 3)) {
    2189        secLastParamPtr += 3;
    2190        dbgPrintf("secLastParamPtr: %c\n", *secLastParamPtr);
    2191        installDeviceNumber = *secLastParamPtr;
    2192     } else {
    2193        installDeviceNumber = *lastParamPtr;
    2194     }
    2195    
    2196     *devicePtr = malloc(6);
    2197     snprintf(*devicePtr, 6, "(hd%c)", installDeviceNumber);
    2198     dbgPrintf("installDeviceNumber: %c\n", installDeviceNumber);
    2199     fclose(grubConf);
    2200     free(line);
    2201     return 0;
    2202        }
    2203    
    2204        free(line);
    2205        fclose(grubConf);
    2206        return 1;
    2207    }
    2208    
    2209    int grubGetBootFromDeviceMap(const char * device,
    2210         char ** bootPtr) {
    2211        FILE * deviceMap;
    2212        char * line = NULL;
    2213        size_t res = 0, len = 0;
    2214        char * devicePtr;
    2215        char * bounds = NULL;
    2216        const char * path;
    2217        const static char default_path[] = "/boot/grub/device.map";
    2218    
    2219        if (!device) return 1;
    2220        if (!bootPtr) return 1;
    2221    
    2222        if ((path = getenv("GRUBBY_GRUB_DEVICE_MAP")) == NULL)
    2223     path = default_path;
    2224    
    2225        dbgPrintf("opening grub device.map file from: %s\n", path);
    2226        deviceMap = fopen(path, "r");
    2227        if (!deviceMap)
    2228     return 1;
    2229    
    2230        while ((res = getline(&line, &len, deviceMap)) != -1) {
    2231            if (!strncmp(line, "#", 1))
    2232        continue;
    2233    
    2234     if (line[res - 1] == '\n')
    2235        line[res - 1] = '\0';
    2236     else if (len > res)
    2237        line[res] = '\0';
    2238     else {
    2239        line = realloc(line, res + 1);
    2240        line[res] = '\0';
    2241     }
    2242    
    2243     devicePtr = line;
    2244     bounds = line + res;
    2245    
    2246     while ((isspace(*line) && ((devicePtr + 1) <= bounds)))
    2247        devicePtr++;
    2248     dbgPrintf("device: %s\n", devicePtr);
    2249    
    2250     if (!strncmp(devicePtr, device, strlen(device))) {
    2251        devicePtr += strlen(device);
    2252        while (isspace(*devicePtr) && ((devicePtr + 1) <= bounds))
    2253            devicePtr++;
    2254    
    2255        *bootPtr = strdup(devicePtr);
    2256        break;
    2257     }
    2258        }
    2259    
    2260        free(line);
    2261        fclose(deviceMap);
    2262        return 0;
    2263    }
    2264    
    2265    int suseGrubConfGetBoot(const char * path, char ** bootPtr) {
    2266        char * grubDevice;
    2267    
    2268        if (suseGrubConfGetInstallDevice(path, &grubDevice))
    2269     dbgPrintf("error looking for grub installation device\n");
    2270        else
    2271     dbgPrintf("grubby installation device: %s\n", grubDevice);
    2272    
    2273        if (grubGetBootFromDeviceMap(grubDevice, bootPtr))
    2274     dbgPrintf("error looking for grub boot device\n");
    2275        else
    2276     dbgPrintf("grubby boot device: %s\n", *bootPtr);
    2277    
    2278        free(grubDevice);
    2279        return 0;
    2280    }
    2281    
    2282    int parseSuseGrubConf(int * lbaPtr, char ** bootPtr) {
    2283        /*
    2284         * This SuSE grub configuration file at this location is not your average
    2285         * grub configuration file, but instead the grub commands used to setup
    2286         * grub on that system.
    2287         */
    2288        const char * path;
    2289        const static char default_path[] = "/etc/grub.conf";
    2290    
    2291        if ((path = getenv("GRUBBY_SUSE_GRUB_CONF")) == NULL)
    2292     path = default_path;
    2293    
    2294        if (!isSuseGrubConf(path)) return 1;
    2295    
    2296        if (lbaPtr) {
    2297            *lbaPtr = 0;
    2298            if (suseGrubConfGetLba(path, lbaPtr))
    2299                return 1;
    2300        }
    2301    
    2302        if (bootPtr) {
    2303            *bootPtr = NULL;
    2304            suseGrubConfGetBoot(path, bootPtr);
    2305        }
    2306    
    2307        return 0;
    2308  }  }
    2309    
    2310  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {
    # Line 1968  int parseSysconfigGrub(int * lbaPtr, cha Line 2355  int parseSysconfigGrub(int * lbaPtr, cha
    2355  }  }
    2356    
    2357  void dumpSysconfigGrub(void) {  void dumpSysconfigGrub(void) {
    2358      char * boot;      char * boot = NULL;
    2359      int lba;      int lba;
    2360    
    2361      if (!parseSysconfigGrub(&lba, &boot)) {      if (isSuseSystem()) {
    2362   if (lba) printf("lba\n");          if (parseSuseGrubConf(&lba, &boot)) {
    2363   if (boot) printf("boot=%s\n", boot);      free(boot);
    2364        return;
    2365     }
    2366        } else {
    2367            if (parseSysconfigGrub(&lba, &boot)) {
    2368        free(boot);
    2369        return;
    2370     }
    2371        }
    2372    
    2373        if (lba) printf("lba\n");
    2374        if (boot) {
    2375     printf("boot=%s\n", boot);
    2376     free(boot);
    2377      }      }
    2378  }  }
    2379    
    # Line 2172  void removeLine(struct singleEntry * ent Line 2572  void removeLine(struct singleEntry * ent
    2572      free(line);      free(line);
    2573  }  }
    2574    
     static int isquote(char q)  
     {  
         if (q == '\'' || q == '\"')  
      return 1;  
         return 0;  
     }  
       
    2575  static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)  static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)
    2576  {  {
    2577      struct singleLine newLine = {      struct singleLine newLine = {
    # Line 2794  int checkForGrub(struct grubConfig * con Line 3187  int checkForGrub(struct grubConfig * con
    3187      int fd;      int fd;
    3188      unsigned char bootSect[512];      unsigned char bootSect[512];
    3189      char * boot;      char * boot;
    3190        int onSuse = isSuseSystem();
    3191    
    3192      if (parseSysconfigGrub(NULL, &boot))  
    3193   return 0;      if (onSuse) {
    3194     if (parseSuseGrubConf(NULL, &boot))
    3195        return 0;
    3196        } else {
    3197     if (parseSysconfigGrub(NULL, &boot))
    3198        return 0;
    3199        }
    3200    
    3201      /* assume grub is not installed -- not an error condition */      /* assume grub is not installed -- not an error condition */
    3202      if (!boot)      if (!boot)
    # Line 2815  int checkForGrub(struct grubConfig * con Line 3215  int checkForGrub(struct grubConfig * con
    3215      }      }
    3216      close(fd);      close(fd);
    3217    
    3218        /* The more elaborate checks do not work on SuSE. The checks done
    3219         * seem to be reasonble (at least for now), so just return success
    3220         */
    3221        if (onSuse)
    3222     return 2;
    3223    
    3224      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
    3225  }  }
    3226    
    # Line 2848  int checkForExtLinux(struct grubConfig * Line 3254  int checkForExtLinux(struct grubConfig *
    3254      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
    3255  }  }
    3256    
    3257    int checkForYaboot(struct grubConfig * config) {
    3258        /*
    3259         * This is a simplistic check that we consider good enough for own puporses
    3260         *
    3261         * If we were to properly check if yaboot is *installed* we'd need to:
    3262         * 1) get the system boot device (LT_BOOT)
    3263         * 2) considering it's a raw filesystem, check if the yaboot binary matches
    3264         *    the content on the boot device
    3265         * 3) if not, copy the binary to a temporary file and run "addnote" on it
    3266         * 4) check again if binary and boot device contents match
    3267         */
    3268        if (!access("/etc/yaboot.conf", R_OK))
    3269     return 2;
    3270    
    3271        return 1;
    3272    }
    3273    
    3274    int checkForElilo(struct grubConfig * config) {
    3275        if (!access("/etc/elilo.conf", R_OK))
    3276     return 2;
    3277    
    3278        return 1;
    3279    }
    3280    
    3281  static char * getRootSpecifier(char * str) {  static char * getRootSpecifier(char * str) {
    3282      char * idx, * rootspec = NULL;      char * idx, * rootspec = NULL;
    3283    
    # Line 2862  static char * getRootSpecifier(char * st Line 3292  static char * getRootSpecifier(char * st
    3292  static char * getInitrdVal(struct grubConfig * config,  static char * getInitrdVal(struct grubConfig * config,
    3293     const char * prefix, struct singleLine *tmplLine,     const char * prefix, struct singleLine *tmplLine,
    3294     const char * newKernelInitrd,     const char * newKernelInitrd,
    3295     char ** extraInitrds, int extraInitrdCount)     const char ** extraInitrds, int extraInitrdCount)
    3296  {  {
    3297      char *initrdVal, *end;      char *initrdVal, *end;
    3298      int i;      int i;
    # Line 2907  static char * getInitrdVal(struct grubCo Line 3337  static char * getInitrdVal(struct grubCo
    3337    
    3338  int addNewKernel(struct grubConfig * config, struct singleEntry * template,  int addNewKernel(struct grubConfig * config, struct singleEntry * template,
    3339           const char * prefix,           const char * prefix,
    3340   char * newKernelPath, char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
    3341   char * newKernelArgs, char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
    3342   char ** extraInitrds, int extraInitrdCount,   const char ** extraInitrds, int extraInitrdCount,
    3343                   char * newMBKernel, char * newMBKernelArgs) {                   const char * newMBKernel, const char * newMBKernelArgs) {
    3344      struct singleEntry * new;      struct singleEntry * new;
    3345      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
    3346      int needs;      int needs;
    # Line 3318  int main(int argc, const char ** argv) { Line 3748  int main(int argc, const char ** argv) {
    3748      int displayDefault = 0;      int displayDefault = 0;
    3749      int displayDefaultIndex = 0;      int displayDefaultIndex = 0;
    3750      int displayDefaultTitle = 0;      int displayDefaultTitle = 0;
    3751        int defaultIndex = -1;
    3752      struct poptOption options[] = {      struct poptOption options[] = {
    3753   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,
    3754      _("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 3766  int main(int argc, const char ** argv) {
    3766   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
    3767      _("filestystem which contains /boot directory (for testing only)"),      _("filestystem which contains /boot directory (for testing only)"),
    3768      _("bootfs") },      _("bootfs") },
    3769  #if defined(__i386__) || defined(__x86_64__)  #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
    3770   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
    3771      _("check if lilo is installed on lilo.conf boot sector") },      _("check which bootloader is installed on boot sector") },
    3772  #endif  #endif
    3773   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,
    3774      _("path to grub config file to update (\"-\" for stdin)"),      _("path to grub config file to update (\"-\" for stdin)"),
    # Line 3390  int main(int argc, const char ** argv) { Line 3821  int main(int argc, const char ** argv) {
    3821   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,
    3822      _("make the first entry referencing the specified kernel "      _("make the first entry referencing the specified kernel "
    3823        "the default"), _("kernel-path") },        "the default"), _("kernel-path") },
    3824     { "set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,
    3825        _("make the given entry index the default entry"),
    3826        _("entry-index") },
    3827   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,
    3828      _("configure silo bootloader") },      _("configure silo bootloader") },
    3829   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,
    # Line 3472  int main(int argc, const char ** argv) { Line 3906  int main(int argc, const char ** argv) {
    3906      }      }
    3907    
    3908      if (!cfi) {      if (!cfi) {
    3909            if (grub2FindConfig(&grub2ConfigType))
    3910        cfi = &grub2ConfigType;
    3911     else
    3912        #ifdef __ia64__        #ifdef __ia64__
    3913   cfi = &eliloConfigType;      cfi = &eliloConfigType;
    3914        #elif __powerpc__        #elif __powerpc__
    3915   cfi = &yabootConfigType;      cfi = &yabootConfigType;
    3916        #elif __sparc__        #elif __sparc__
    3917          cfi = &siloConfigType;              cfi = &siloConfigType;
    3918        #elif __s390__        #elif __s390__
    3919          cfi = &ziplConfigType;              cfi = &ziplConfigType;
    3920        #elif __s390x__        #elif __s390x__
    3921          cfi = &ziplConfigtype;              cfi = &ziplConfigtype;
    3922        #else        #else
             if (grub2FindConfig(&grub2ConfigType))  
         cfi = &grub2ConfigType;  
      else  
    3923      cfi = &grubConfigType;      cfi = &grubConfigType;
    3924        #endif        #endif
    3925      }      }
    # Line 3498  int main(int argc, const char ** argv) { Line 3932  int main(int argc, const char ** argv) {
    3932      }      }
    3933    
    3934      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||
    3935    newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
    3936    defaultKernel || displayDefaultIndex || displayDefaultTitle)) {      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
    3937        (defaultIndex >= 0))) {
    3938   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
    3939    "specified option"));    "specified option"));
    3940   return 1;   return 1;
    # Line 3541  int main(int argc, const char ** argv) { Line 3976  int main(int argc, const char ** argv) {
    3976   makeDefault = 1;   makeDefault = 1;
    3977   defaultKernel = NULL;   defaultKernel = NULL;
    3978      }      }
    3979        else if (defaultKernel && (defaultIndex >= 0)) {
    3980     fprintf(stderr, _("grubby: --set-default and --set-default-index "
    3981      "may not be used together\n"));
    3982     return 1;
    3983        }
    3984    
    3985      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {
    3986   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 3989  int main(int argc, const char ** argv) {
    3989      }      }
    3990    
    3991      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
    3992   && !kernelInfo && !bootloaderProbe && !updateKernelPath   && !kernelInfo && !bootloaderProbe && !updateKernelPath
    3993          && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle) {   && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle
    3994     && (defaultIndex == -1)) {
    3995   fprintf(stderr, _("grubby: no action specified\n"));   fprintf(stderr, _("grubby: no action specified\n"));
    3996   return 1;   return 1;
    3997      }      }
    # Line 3577  int main(int argc, const char ** argv) { Line 4018  int main(int argc, const char ** argv) {
    4018      }      }
    4019    
    4020      if (bootloaderProbe) {      if (bootloaderProbe) {
    4021   int lrc = 0, grc = 0, gr2c = 0, erc = 0;   int lrc = 0, grc = 0, gr2c = 0, extrc = 0, yrc = 0, erc = 0;
    4022   struct grubConfig * lconfig, * gconfig;   struct grubConfig * lconfig, * gconfig, * yconfig, * econfig;
    4023    
    4024   const char *grub2config = grub2FindConfig(&grub2ConfigType);   const char *grub2config = grub2FindConfig(&grub2ConfigType);
    4025   if (grub2config) {   if (grub2config) {
    # Line 3606  int main(int argc, const char ** argv) { Line 4047  int main(int argc, const char ** argv) {
    4047   lrc = checkForLilo(lconfig);   lrc = checkForLilo(lconfig);
    4048   }   }
    4049    
    4050     if (!access(eliloConfigType.defaultConfig, F_OK)) {
    4051        econfig = readConfig(eliloConfigType.defaultConfig,
    4052     &eliloConfigType);
    4053        if (!econfig)
    4054     erc = 1;
    4055        else
    4056     erc = checkForElilo(econfig);
    4057     }
    4058    
    4059   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {
    4060      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);
    4061      if (!lconfig)      if (!lconfig)
    4062   erc = 1;   extrc = 1;
    4063      else      else
    4064   erc = checkForExtLinux(lconfig);   extrc = checkForExtLinux(lconfig);
    4065   }   }
    4066    
    4067   if (lrc == 1 || grc == 1 || gr2c == 1) return 1;  
    4068     if (!access(yabootConfigType.defaultConfig, F_OK)) {
    4069        yconfig = readConfig(yabootConfigType.defaultConfig,
    4070     &yabootConfigType);
    4071        if (!yconfig)
    4072     yrc = 1;
    4073        else
    4074     yrc = checkForYaboot(yconfig);
    4075     }
    4076    
    4077     if (lrc == 1 || grc == 1 || gr2c == 1 || extrc == 1 || yrc == 1 ||
    4078     erc == 1)
    4079        return 1;
    4080    
    4081   if (lrc == 2) printf("lilo\n");   if (lrc == 2) printf("lilo\n");
    4082   if (gr2c == 2) printf("grub2\n");   if (gr2c == 2) printf("grub2\n");
    4083   if (grc == 2) printf("grub\n");   if (grc == 2) printf("grub\n");
    4084   if (erc == 2) printf("extlinux\n");   if (extrc == 2) printf("extlinux\n");
    4085     if (yrc == 2) printf("yaboot\n");
    4086     if (erc == 2) printf("elilo\n");
    4087    
    4088   return 0;   return 0;
    4089      }      }
    # Line 3686  int main(int argc, const char ** argv) { Line 4150  int main(int argc, const char ** argv) {
    4150      markRemovedImage(config, removeKernelPath, bootPrefix);      markRemovedImage(config, removeKernelPath, bootPrefix);
    4151      markRemovedImage(config, removeMBKernel, bootPrefix);      markRemovedImage(config, removeMBKernel, bootPrefix);
    4152      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,
    4153      bootPrefix, flags);      bootPrefix, flags, defaultIndex);
    4154      setFallbackImage(config, newKernelPath != NULL);      setFallbackImage(config, newKernelPath != NULL);
    4155      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
    4156                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
    # Line 3696  int main(int argc, const char ** argv) { Line 4160  int main(int argc, const char ** argv) {
    4160      }      }
    4161      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
    4162                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
    4163                       extraInitrds, extraInitrdCount,                       (const char **)extraInitrds, extraInitrdCount,
    4164                       newMBKernel, newMBKernelArgs)) return 1;                       newMBKernel, newMBKernelArgs)) return 1;
    4165            
    4166    
    Legend:
    Removed from v.1746  
    changed lines
      Added in v.1868