Magellan Linux

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

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

revision 1717 by niro, Sat Feb 18 00:47:17 2012 UTC revision 2052 by niro, Wed Feb 20 14:00:54 2013 UTC
# Line 46  Line 46 
46  #define dbgPrintf(format, args...)  #define dbgPrintf(format, args...)
47  #endif  #endif
48    
49    int debug = 0; /* Currently just for template debugging */
50    
51  #define _(A) (A)  #define _(A) (A)
52    
53  #define MAX_EXTRA_INITRDS  16 /* code segment checked by --bootloader-probe */  #define MAX_EXTRA_INITRDS  16 /* code segment checked by --bootloader-probe */
54  #define CODE_SEG_SIZE  128 /* code segment checked by --bootloader-probe */  #define CODE_SEG_SIZE  128 /* code segment checked by --bootloader-probe */
55    
56    #define NOOP_OPCODE 0x90
57    #define JMP_SHORT_OPCODE 0xeb
58    
59    int isEfi = 0;
60    
61  /* comments get lumped in with indention */  /* comments get lumped in with indention */
62  struct lineElement {  struct lineElement {
63      char * item;      char * item;
# Line 77  enum lineType_e { Line 84  enum lineType_e {
84      LT_MENUENTRY    = 1 << 17,      LT_MENUENTRY    = 1 << 17,
85      LT_ENTRY_END    = 1 << 18,      LT_ENTRY_END    = 1 << 18,
86      LT_SET_VARIABLE = 1 << 19,      LT_SET_VARIABLE = 1 << 19,
87      LT_UNKNOWN      = 1 << 20,      LT_KERNEL_EFI   = 1 << 20,
88        LT_INITRD_EFI   = 1 << 21,
89        LT_UNKNOWN      = 1 << 22,
90  };  };
91    
92  struct singleLine {  struct singleLine {
# Line 109  struct singleEntry { Line 118  struct singleEntry {
118    
119  #define MAIN_DEFAULT    (1 << 0)  #define MAIN_DEFAULT    (1 << 0)
120  #define DEFAULT_SAVED       -2  #define DEFAULT_SAVED       -2
121    #define DEFAULT_SAVED_GRUB2 -3
122    
123  struct keywordTypes {  struct keywordTypes {
124      char * key;      char * key;
# Line 158  struct keywordTypes grubKeywords[] = { Line 168  struct keywordTypes grubKeywords[] = {
168    
169  const char *grubFindConfig(struct configFileInfo *cfi) {  const char *grubFindConfig(struct configFileInfo *cfi) {
170      static const char *configFiles[] = {      static const char *configFiles[] = {
  "/etc/grub.conf",  
171   "/boot/grub/grub.conf",   "/boot/grub/grub.conf",
172   "/boot/grub/menu.lst",   "/boot/grub/menu.lst",
173     "/etc/grub.conf",
174   NULL   NULL
175      };      };
176      static int i = -1;      static int i = -1;
# Line 199  struct keywordTypes grub2Keywords[] = { Line 209  struct keywordTypes grub2Keywords[] = {
209      { "default",    LT_DEFAULT,     ' ' },      { "default",    LT_DEFAULT,     ' ' },
210      { "fallback",   LT_FALLBACK,    ' ' },      { "fallback",   LT_FALLBACK,    ' ' },
211      { "linux",      LT_KERNEL,      ' ' },      { "linux",      LT_KERNEL,      ' ' },
212        { "linuxefi",   LT_KERNEL_EFI,  ' ' },
213      { "initrd",     LT_INITRD,      ' ', ' ' },      { "initrd",     LT_INITRD,      ' ', ' ' },
214        { "initrdefi",  LT_INITRD_EFI,  ' ', ' ' },
215      { "module",     LT_MBMODULE,    ' ' },      { "module",     LT_MBMODULE,    ' ' },
216      { "kernel",     LT_HYPER,       ' ' },      { "kernel",     LT_HYPER,       ' ' },
217      { NULL, 0, 0 },      { NULL, 0, 0 },
# Line 236  const char *grub2FindConfig(struct confi Line 248  const char *grub2FindConfig(struct confi
248      return configFiles[i];      return configFiles[i];
249  }  }
250    
251    int sizeOfSingleLine(struct singleLine * line) {
252      int count = 0;
253    
254      for (int i = 0; i < line->numElements; i++) {
255        int indentSize = 0;
256    
257        count = count + strlen(line->elements[i].item);
258    
259        indentSize = strlen(line->elements[i].indent);
260        if (indentSize > 0)
261          count = count + indentSize;
262        else
263          /* be extra safe and add room for whitespaces */
264          count = count + 1;
265      }
266    
267      /* room for trailing terminator */
268      count = count + 1;
269    
270      return count;
271    }
272    
273    static int isquote(char q)
274    {
275        if (q == '\'' || q == '\"')
276     return 1;
277        return 0;
278    }
279    
280    static int iskernel(enum lineType_e type) {
281        return (type == LT_KERNEL || type == LT_KERNEL_EFI);
282    }
283    
284    static int isinitrd(enum lineType_e type) {
285        return (type == LT_INITRD || type == LT_INITRD_EFI);
286    }
287    
288    char *grub2ExtractTitle(struct singleLine * line) {
289        char * current;
290        char * current_indent;
291        int current_len;
292        int current_indent_len;
293        int i;
294    
295        /* bail out if line does not start with menuentry */
296        if (strcmp(line->elements[0].item, "menuentry"))
297          return NULL;
298    
299        i = 1;
300        current = line->elements[i].item;
301        current_len = strlen(current);
302    
303        /* if second word is quoted, strip the quotes and return single word */
304        if (isquote(*current) && isquote(current[current_len - 1])) {
305     char *tmp;
306    
307     tmp = strdup(current);
308     *(tmp + current_len - 1) = '\0';
309     return ++tmp;
310        }
311    
312        /* if no quotes, return second word verbatim */
313        if (!isquote(*current))
314     return current;
315    
316        /* second element start with a quote, so we have to find the element
317         * whose last character is also quote (assuming it's the closing one) */
318        int resultMaxSize;
319        char * result;
320        
321        resultMaxSize = sizeOfSingleLine(line);
322        result = malloc(resultMaxSize);
323        snprintf(result, resultMaxSize, "%s", ++current);
324        
325        i++;
326        for (; i < line->numElements; ++i) {
327     current = line->elements[i].item;
328     current_len = strlen(current);
329     current_indent = line->elements[i].indent;
330     current_indent_len = strlen(current_indent);
331    
332     strncat(result, current_indent, current_indent_len);
333     if (!isquote(current[current_len-1])) {
334        strncat(result, current, current_len);
335     } else {
336        strncat(result, current, current_len - 1);
337        break;
338     }
339        }
340        return result;
341    }
342    
343  struct configFileInfo grub2ConfigType = {  struct configFileInfo grub2ConfigType = {
344      .findConfig = grub2FindConfig,      .findConfig = grub2FindConfig,
345      .keywords = grub2Keywords,      .keywords = grub2Keywords,
346      .defaultIsIndex = 1,      .defaultIsIndex = 1,
347      .defaultSupportSaved = 0,      .defaultSupportSaved = 1,
348      .defaultIsVariable = 1,      .defaultIsVariable = 1,
349      .entryStart = LT_MENUENTRY,      .entryStart = LT_MENUENTRY,
350      .entryEnd = LT_ENTRY_END,      .entryEnd = LT_ENTRY_END,
# Line 480  static char * sdupprintf(const char *for Line 584  static char * sdupprintf(const char *for
584      return buf;      return buf;
585  }  }
586    
587    static enum lineType_e preferredLineType(enum lineType_e type,
588     struct configFileInfo *cfi) {
589        if (isEfi && cfi == &grub2ConfigType) {
590     switch (type) {
591     case LT_KERNEL:
592        return LT_KERNEL_EFI;
593     case LT_INITRD:
594        return LT_INITRD_EFI;
595     default:
596        return type;
597     }
598        }
599        return type;
600    }
601    
602  static struct keywordTypes * getKeywordByType(enum lineType_e type,  static struct keywordTypes * getKeywordByType(enum lineType_e type,
603        struct configFileInfo * cfi) {        struct configFileInfo * cfi) {
604      struct keywordTypes * kw;      for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
     for (kw = cfi->keywords; kw->key; kw++) {  
605   if (kw->type == type)   if (kw->type == type)
606      return kw;      return kw;
607      }      }
# Line 513  static char * getuuidbydev(char *device) Line 631  static char * getuuidbydev(char *device)
631    
632  static enum lineType_e getTypeByKeyword(char * keyword,  static enum lineType_e getTypeByKeyword(char * keyword,
633   struct configFileInfo * cfi) {   struct configFileInfo * cfi) {
634      struct keywordTypes * kw;      for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
     for (kw = cfi->keywords; kw->key; kw++) {  
635   if (!strcmp(keyword, kw->key))   if (!strcmp(keyword, kw->key))
636      return kw->type;      return kw->type;
637      }      }
# Line 601  static void lineInit(struct singleLine * Line 718  static void lineInit(struct singleLine *
718  }  }
719    
720  struct singleLine * lineDup(struct singleLine * line) {  struct singleLine * lineDup(struct singleLine * line) {
     int i;  
721      struct singleLine * newLine = malloc(sizeof(*newLine));      struct singleLine * newLine = malloc(sizeof(*newLine));
722    
723      newLine->indent = strdup(line->indent);      newLine->indent = strdup(line->indent);
# Line 611  struct singleLine * lineDup(struct singl Line 727  struct singleLine * lineDup(struct singl
727      newLine->elements = malloc(sizeof(*newLine->elements) *      newLine->elements = malloc(sizeof(*newLine->elements) *
728         newLine->numElements);         newLine->numElements);
729    
730      for (i = 0; i < newLine->numElements; i++) {      for (int i = 0; i < newLine->numElements; i++) {
731   newLine->elements[i].indent = strdup(line->elements[i].indent);   newLine->elements[i].indent = strdup(line->elements[i].indent);
732   newLine->elements[i].item = strdup(line->elements[i].item);   newLine->elements[i].item = strdup(line->elements[i].item);
733      }      }
# Line 620  struct singleLine * lineDup(struct singl Line 736  struct singleLine * lineDup(struct singl
736  }  }
737    
738  static void lineFree(struct singleLine * line) {  static void lineFree(struct singleLine * line) {
     int i;  
   
739      if (line->indent) free(line->indent);      if (line->indent) free(line->indent);
740    
741      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
742   free(line->elements[i].item);   free(line->elements[i].item);
743   free(line->elements[i].indent);   free(line->elements[i].indent);
744      }      }
# Line 635  static void lineFree(struct singleLine * Line 749  static void lineFree(struct singleLine *
749    
750  static int lineWrite(FILE * out, struct singleLine * line,  static int lineWrite(FILE * out, struct singleLine * line,
751       struct configFileInfo * cfi) {       struct configFileInfo * cfi) {
     int i;  
   
752      if (fprintf(out, "%s", line->indent) == -1) return -1;      if (fprintf(out, "%s", line->indent) == -1) return -1;
753    
754      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
755     /* Need to handle this, because we strip the quotes from
756     * menuentry when read it. */
757     if (line->type == LT_MENUENTRY && i == 1) {
758        if(!isquote(*line->elements[i].item))
759     fprintf(out, "\'%s\'", line->elements[i].item);
760        else
761     fprintf(out, "%s", line->elements[i].item);
762        fprintf(out, "%s", line->elements[i].indent);
763    
764        continue;
765     }
766    
767   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)
768      if (fputc('"', out) == EOF) return -1;      if (fputc('"', out) == EOF) return -1;
769    
# Line 733  static int getNextLine(char ** bufPtr, s Line 857  static int getNextLine(char ** bufPtr, s
857      if (*line->elements[0].item == '#') {      if (*line->elements[0].item == '#') {
858   char * fullLine;   char * fullLine;
859   int len;   int len;
  int i;  
860    
861   len = strlen(line->indent);   len = strlen(line->indent);
862   for (i = 0; i < line->numElements; i++)   for (int i = 0; i < line->numElements; i++)
863      len += strlen(line->elements[i].item) +      len += strlen(line->elements[i].item) +
864     strlen(line->elements[i].indent);     strlen(line->elements[i].indent);
865    
# Line 745  static int getNextLine(char ** bufPtr, s Line 868  static int getNextLine(char ** bufPtr, s
868   free(line->indent);   free(line->indent);
869   line->indent = fullLine;   line->indent = fullLine;
870    
871   for (i = 0; i < line->numElements; i++) {   for (int i = 0; i < line->numElements; i++) {
872      strcat(fullLine, line->elements[i].item);      strcat(fullLine, line->elements[i].item);
873      strcat(fullLine, line->elements[i].indent);      strcat(fullLine, line->elements[i].indent);
874      free(line->elements[i].item);      free(line->elements[i].item);
# Line 764  static int getNextLine(char ** bufPtr, s Line 887  static int getNextLine(char ** bufPtr, s
887   * elements up more   * elements up more
888   */   */
889   if (!isspace(kw->separatorChar)) {   if (!isspace(kw->separatorChar)) {
     int i;  
890      char indent[2] = "";      char indent[2] = "";
891      indent[0] = kw->separatorChar;      indent[0] = kw->separatorChar;
892      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
893   char *p;   char *p;
  int j;  
894   int numNewElements;   int numNewElements;
895    
896   numNewElements = 0;   numNewElements = 0;
# Line 785  static int getNextLine(char ** bufPtr, s Line 906  static int getNextLine(char ** bufPtr, s
906      sizeof(*line->elements) * elementsAlloced);      sizeof(*line->elements) * elementsAlloced);
907   }   }
908    
909   for (j = line->numElements; j > i; j--) {   for (int j = line->numElements; j > i; j--) {
910   line->elements[j + numNewElements] = line->elements[j];   line->elements[j + numNewElements] = line->elements[j];
911   }   }
912   line->numElements += numNewElements;   line->numElements += numNewElements;
# Line 798  static int getNextLine(char ** bufPtr, s Line 919  static int getNextLine(char ** bufPtr, s
919   break;   break;
920   }   }
921    
922   free(line->elements[i].indent);   line->elements[i + 1].indent = line->elements[i].indent;
923   line->elements[i].indent = strdup(indent);   line->elements[i].indent = strdup(indent);
924   *p++ = '\0';   *p++ = '\0';
925   i++;   i++;
926   line->elements[i].item = strdup(p);   line->elements[i].item = strdup(p);
  line->elements[i].indent = strdup("");  
  p = line->elements[i].item;  
927   }   }
928      }      }
929   }   }
# Line 825  static struct grubConfig * readConfig(co Line 944  static struct grubConfig * readConfig(co
944      struct singleLine * last = NULL, * line, * defaultLine = NULL;      struct singleLine * last = NULL, * line, * defaultLine = NULL;
945      char * end;      char * end;
946      struct singleEntry * entry = NULL;      struct singleEntry * entry = NULL;
947      int i, len;      int len;
948      char * buf;      char * buf;
949    
950      if (!strcmp(inName, "-")) {      if (!strcmp(inName, "-")) {
# Line 871  static struct grubConfig * readConfig(co Line 990  static struct grubConfig * readConfig(co
990      cfg->secondaryIndent = strdup(line->indent);      cfg->secondaryIndent = strdup(line->indent);
991   }   }
992    
993   if (isEntryStart(line, cfi)) {   if (isEntryStart(line, cfi) || (cfg->entries && !sawEntry)) {
994      sawEntry = 1;      sawEntry = 1;
995      if (!entry) {      if (!entry) {
996   cfg->entries = malloc(sizeof(*entry));   cfg->entries = malloc(sizeof(*entry));
# Line 888  static struct grubConfig * readConfig(co Line 1007  static struct grubConfig * readConfig(co
1007   }   }
1008    
1009   if (line->type == LT_SET_VARIABLE) {   if (line->type == LT_SET_VARIABLE) {
     int i;  
1010      dbgPrintf("found 'set' command (%d elements): ", line->numElements);      dbgPrintf("found 'set' command (%d elements): ", line->numElements);
1011      dbgPrintf("%s", line->indent);      dbgPrintf("%s", line->indent);
1012      for (i = 0; i < line->numElements; i++)      for (int i = 0; i < line->numElements; i++)
1013   dbgPrintf("%s\"%s\"", line->elements[i].indent, line->elements[i].item);   dbgPrintf("\"%s\"%s", line->elements[i].item, line->elements[i].indent);
1014      dbgPrintf("\n");      dbgPrintf("\n");
1015      struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);      struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
1016      if (kwType && line->numElements == 3 &&      if (kwType && line->numElements == 3 &&
# Line 905  static struct grubConfig * readConfig(co Line 1023  static struct grubConfig * readConfig(co
1023      cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;      cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
1024      defaultLine = line;      defaultLine = line;
1025    
1026          } else if (line->type == LT_KERNEL) {          } else if (iskernel(line->type)) {
1027      /* if by some freak chance this is multiboot and the "module"      /* if by some freak chance this is multiboot and the "module"
1028       * lines came earlier in the template, make sure to use LT_HYPER       * lines came earlier in the template, make sure to use LT_HYPER
1029       * instead of LT_KERNEL now       * instead of LT_KERNEL now
# Line 919  static struct grubConfig * readConfig(co Line 1037  static struct grubConfig * readConfig(co
1037       * This only applies to grub, but that's the only place we       * This only applies to grub, but that's the only place we
1038       * should find LT_MBMODULE lines anyway.       * should find LT_MBMODULE lines anyway.
1039       */       */
1040      struct singleLine * l;      for (struct singleLine *l = entry->lines; l; l = l->next) {
     for (l = entry->lines; l; l = l->next) {  
1041   if (l->type == LT_HYPER)   if (l->type == LT_HYPER)
1042      break;      break;
1043   else if (l->type == LT_KERNEL) {   else if (iskernel(l->type)) {
1044      l->type = LT_HYPER;      l->type = LT_HYPER;
1045      break;      break;
1046   }   }
# Line 940  static struct grubConfig * readConfig(co Line 1057  static struct grubConfig * readConfig(co
1057   } else if (line->type == LT_TITLE && line->numElements > 1) {   } else if (line->type == LT_TITLE && line->numElements > 1) {
1058      /* make the title a single argument (undoing our parsing) */      /* make the title a single argument (undoing our parsing) */
1059      len = 0;      len = 0;
1060      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
1061   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
1062   len += strlen(line->elements[i].indent);   len += strlen(line->elements[i].indent);
1063      }      }
1064      buf = malloc(len + 1);      buf = malloc(len + 1);
1065      *buf = '\0';      *buf = '\0';
1066    
1067      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
1068   strcat(buf, line->elements[i].item);   strcat(buf, line->elements[i].item);
1069   free(line->elements[i].item);   free(line->elements[i].item);
1070    
# Line 961  static struct grubConfig * readConfig(co Line 1078  static struct grubConfig * readConfig(co
1078      line->elements[line->numElements - 1].indent;      line->elements[line->numElements - 1].indent;
1079      line->elements[1].item = buf;      line->elements[1].item = buf;
1080      line->numElements = 2;      line->numElements = 2;
1081     } else if (line->type == LT_MENUENTRY && line->numElements > 3) {
1082        /* let --remove-kernel="TITLE=what" work */
1083        len = 0;
1084        char *extras;
1085        char *title;
1086    
1087        for (int i = 1; i < line->numElements; i++) {
1088     len += strlen(line->elements[i].item);
1089     len += strlen(line->elements[i].indent);
1090        }
1091        buf = malloc(len + 1);
1092        *buf = '\0';
1093    
1094        /* allocate mem for extra flags. */
1095        extras = malloc(len + 1);
1096        *extras = '\0';
1097    
1098        /* get title. */
1099        for (int i = 0; i < line->numElements; i++) {
1100     if (!strcmp(line->elements[i].item, "menuentry"))
1101        continue;
1102     if (isquote(*line->elements[i].item))
1103        title = line->elements[i].item + 1;
1104     else
1105        title = line->elements[i].item;
1106    
1107     len = strlen(title);
1108            if (isquote(title[len-1])) {
1109        strncat(buf, title,len-1);
1110        break;
1111     } else {
1112        strcat(buf, title);
1113        strcat(buf, line->elements[i].indent);
1114     }
1115        }
1116    
1117        /* get extras */
1118        int count = 0;
1119        for (int i = 0; i < line->numElements; i++) {
1120     if (count >= 2) {
1121        strcat(extras, line->elements[i].item);
1122        strcat(extras, line->elements[i].indent);
1123     }
1124    
1125     if (!strcmp(line->elements[i].item, "menuentry"))
1126        continue;
1127    
1128     /* count ' or ", there should be two in menuentry line. */
1129     if (isquote(*line->elements[i].item))
1130        count++;
1131    
1132     len = strlen(line->elements[i].item);
1133    
1134     if (isquote(line->elements[i].item[len -1]))
1135        count++;
1136    
1137     /* ok, we get the final ' or ", others are extras. */
1138                }
1139        line->elements[1].indent =
1140     line->elements[line->numElements - 2].indent;
1141        line->elements[1].item = buf;
1142        line->elements[2].indent =
1143     line->elements[line->numElements - 2].indent;
1144        line->elements[2].item = extras;
1145        line->numElements = 3;
1146   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {
1147      /* Strip off any " which may be present; they'll be put back      /* Strip off any " which may be present; they'll be put back
1148         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 970  static struct grubConfig * readConfig(co Line 1151  static struct grubConfig * readConfig(co
1151      if (line->numElements >= 2) {      if (line->numElements >= 2) {
1152   int last, len;   int last, len;
1153    
1154   if (*line->elements[1].item == '"')   if (isquote(*line->elements[1].item))
1155      memmove(line->elements[1].item, line->elements[1].item + 1,      memmove(line->elements[1].item, line->elements[1].item + 1,
1156      strlen(line->elements[1].item + 1) + 1);      strlen(line->elements[1].item + 1) + 1);
1157    
1158   last = line->numElements - 1;   last = line->numElements - 1;
1159   len = strlen(line->elements[last].item) - 1;   len = strlen(line->elements[last].item) - 1;
1160   if (line->elements[last].item[len] == '"')   if (isquote(line->elements[last].item[len]))
1161      line->elements[last].item[len] = '\0';      line->elements[last].item[len] = '\0';
1162      }      }
1163   }   }
# Line 1035  static struct grubConfig * readConfig(co Line 1216  static struct grubConfig * readConfig(co
1216    
1217      dbgPrintf("defaultLine is %s\n", defaultLine ? "set" : "unset");      dbgPrintf("defaultLine is %s\n", defaultLine ? "set" : "unset");
1218      if (defaultLine) {      if (defaultLine) {
1219   if (cfi->defaultIsVariable) {          if (defaultLine->numElements > 2 &&
1220        cfi->defaultSupportSaved &&
1221        !strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {
1222        cfg->defaultImage = DEFAULT_SAVED_GRUB2;
1223     } else if (cfi->defaultIsVariable) {
1224      char *value = defaultLine->elements[2].item;      char *value = defaultLine->elements[2].item;
1225      while (*value && (*value == '"' || *value == '\'' ||      while (*value && (*value == '"' || *value == '\'' ||
1226      *value == ' ' || *value == '\t'))      *value == ' ' || *value == '\t'))
# Line 1052  static struct grubConfig * readConfig(co Line 1237  static struct grubConfig * readConfig(co
1237      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);
1238      if (*end) cfg->defaultImage = -1;      if (*end) cfg->defaultImage = -1;
1239   } else if (defaultLine->numElements >= 2) {   } else if (defaultLine->numElements >= 2) {
1240      i = 0;      int i = 0;
1241      while ((entry = findEntryByIndex(cfg, i))) {      while ((entry = findEntryByIndex(cfg, i))) {
1242   for (line = entry->lines; line; line = line->next)   for (line = entry->lines; line; line = line->next)
1243      if (line->type == LT_TITLE) break;      if (line->type == LT_TITLE) break;
# Line 1092  static void writeDefault(FILE * out, cha Line 1277  static void writeDefault(FILE * out, cha
1277    
1278      if (cfg->defaultImage == DEFAULT_SAVED)      if (cfg->defaultImage == DEFAULT_SAVED)
1279   fprintf(out, "%sdefault%ssaved\n", indent, separator);   fprintf(out, "%sdefault%ssaved\n", indent, separator);
1280        else if (cfg->defaultImage == DEFAULT_SAVED_GRUB2)
1281     fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
1282      else if (cfg->defaultImage > -1) {      else if (cfg->defaultImage > -1) {
1283   if (cfg->cfi->defaultIsIndex) {   if (cfg->cfi->defaultIsIndex) {
1284      if (cfg->cfi->defaultIsVariable) {      if (cfg->cfi->defaultIsVariable) {
# Line 1152  static int writeConfig(struct grubConfig Line 1339  static int writeConfig(struct grubConfig
1339    
1340      /* most likely the symlink is relative, so change our      /* most likely the symlink is relative, so change our
1341         directory to the dir of the symlink */         directory to the dir of the symlink */
1342              rc = chdir(dirname(strdupa(outName)));      char *dir = strdupa(outName);
1343        rc = chdir(dirname(dir));
1344      do {      do {
1345   buf = alloca(len + 1);   buf = alloca(len + 1);
1346   rc = readlink(basename(outName), buf, len);   rc = readlink(basename(outName), buf, len);
# Line 1290  static char *findDiskForRoot() Line 1478  static char *findDiskForRoot()
1478      buf[rc] = '\0';      buf[rc] = '\0';
1479      chptr = buf;      chptr = buf;
1480    
1481        char *foundanswer = NULL;
1482    
1483      while (chptr && chptr != buf+rc) {      while (chptr && chptr != buf+rc) {
1484          devname = chptr;          devname = chptr;
1485    
# Line 1317  static char *findDiskForRoot() Line 1507  static char *findDiskForRoot()
1507           * for '/' obviously.           * for '/' obviously.
1508           */           */
1509          if (*(++chptr) == '/' && *(++chptr) == ' ') {          if (*(++chptr) == '/' && *(++chptr) == ' ') {
1510              /*              /* remember the last / entry in mtab */
1511               * 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);  
1512          }          }
1513    
1514          /* Next line */          /* Next line */
# Line 1332  static char *findDiskForRoot() Line 1517  static char *findDiskForRoot()
1517              chptr++;              chptr++;
1518      }      }
1519    
1520        /* Return the last / entry found */
1521        if (foundanswer) {
1522            chptr = strchr(foundanswer, ' ');
1523            *chptr = '\0';
1524            return strdup(foundanswer);
1525        }
1526    
1527      return NULL;      return NULL;
1528  }  }
1529    
1530    void printEntry(struct singleEntry * entry) {
1531        int i;
1532        struct singleLine * line;
1533    
1534        for (line = entry->lines; line; line = line->next) {
1535     fprintf(stderr, "DBG: %s", line->indent);
1536     for (i = 0; i < line->numElements; i++) {
1537        /* Need to handle this, because we strip the quotes from
1538         * menuentry when read it. */
1539        if (line->type == LT_MENUENTRY && i == 1) {
1540     if(!isquote(*line->elements[i].item))
1541        fprintf(stderr, "\'%s\'", line->elements[i].item);
1542     else
1543        fprintf(stderr, "%s", line->elements[i].item);
1544     fprintf(stderr, "%s", line->elements[i].indent);
1545    
1546     continue;
1547        }
1548        
1549        fprintf(stderr, "%s%s",
1550        line->elements[i].item, line->elements[i].indent);
1551     }
1552     fprintf(stderr, "\n");
1553        }
1554    }
1555    
1556    void notSuitablePrintf(struct singleEntry * entry, const char *fmt, ...)
1557    {
1558        va_list argp;
1559    
1560        if (!debug)
1561     return;
1562    
1563        va_start(argp, fmt);
1564        fprintf(stderr, "DBG: Image entry failed: ");
1565        vfprintf(stderr, fmt, argp);
1566        printEntry(entry);
1567        va_end(argp);
1568    }
1569    
1570    #define beginswith(s, c) ((s) && (s)[0] == (c))
1571    
1572    static int endswith(const char *s, char c)
1573    {
1574     int slen;
1575    
1576     if (!s || !s[0])
1577     return 0;
1578     slen = strlen(s) - 1;
1579    
1580     return s[slen] == c;
1581    }
1582    
1583  int suitableImage(struct singleEntry * entry, const char * bootPrefix,  int suitableImage(struct singleEntry * entry, const char * bootPrefix,
1584    int skipRemoved, int flags) {    int skipRemoved, int flags) {
1585      struct singleLine * line;      struct singleLine * line;
# Line 1344  int suitableImage(struct singleEntry * e Line 1589  int suitableImage(struct singleEntry * e
1589      char * rootspec;      char * rootspec;
1590      char * rootdev;      char * rootdev;
1591    
1592      if (skipRemoved && entry->skip) return 0;      if (skipRemoved && entry->skip) {
1593     notSuitablePrintf(entry, "marked to skip\n");
1594     return 0;
1595        }
1596    
1597      line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);      line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
1598      if (!line || line->numElements < 2) return 0;      if (!line) {
1599     notSuitablePrintf(entry, "no line found\n");
1600     return 0;
1601        }
1602        if (line->numElements < 2) {
1603     notSuitablePrintf(entry, "line has only %d elements\n",
1604        line->numElements);
1605     return 0;
1606        }
1607    
1608      if (flags & GRUBBY_BADIMAGE_OKAY) return 1;      if (flags & GRUBBY_BADIMAGE_OKAY) return 1;
1609    
1610      fullName = alloca(strlen(bootPrefix) +      fullName = alloca(strlen(bootPrefix) +
1611        strlen(line->elements[1].item) + 1);        strlen(line->elements[1].item) + 1);
1612      rootspec = getRootSpecifier(line->elements[1].item);      rootspec = getRootSpecifier(line->elements[1].item);
1613      sprintf(fullName, "%s%s", bootPrefix,      int rootspec_offset = rootspec ? strlen(rootspec) : 0;
1614              line->elements[1].item + (rootspec ? strlen(rootspec) : 0));      int hasslash = endswith(bootPrefix, '/') ||
1615      if (access(fullName, R_OK)) return 0;       beginswith(line->elements[1].item + rootspec_offset, '/');
1616        sprintf(fullName, "%s%s%s", bootPrefix, hasslash ? "" : "/",
1617                line->elements[1].item + rootspec_offset);
1618        if (access(fullName, R_OK)) {
1619     notSuitablePrintf(entry, "access to %s failed\n", fullName);
1620     return 0;
1621        }
1622      for (i = 2; i < line->numElements; i++)      for (i = 2; i < line->numElements; i++)
1623   if (!strncasecmp(line->elements[i].item, "root=", 5)) break;   if (!strncasecmp(line->elements[i].item, "root=", 5)) break;
1624      if (i < line->numElements) {      if (i < line->numElements) {
# Line 1375  int suitableImage(struct singleEntry * e Line 1636  int suitableImage(struct singleEntry * e
1636      line = getLineByType(LT_KERNELARGS|LT_MBMODULE, entry->lines);      line = getLineByType(LT_KERNELARGS|LT_MBMODULE, entry->lines);
1637    
1638              /* failed to find one */              /* failed to find one */
1639              if (!line) return 0;              if (!line) {
1640     notSuitablePrintf(entry, "no line found\n");
1641     return 0;
1642                }
1643    
1644      for (i = 1; i < line->numElements; i++)      for (i = 1; i < line->numElements; i++)
1645          if (!strncasecmp(line->elements[i].item, "root=", 5)) break;          if (!strncasecmp(line->elements[i].item, "root=", 5)) break;
1646      if (i < line->numElements)      if (i < line->numElements)
1647          dev = line->elements[i].item + 5;          dev = line->elements[i].item + 5;
1648      else {      else {
1649     notSuitablePrintf(entry, "no root= entry found\n");
1650   /* it failed too...  can't find root= */   /* it failed too...  can't find root= */
1651          return 0;          return 0;
1652              }              }
# Line 1389  int suitableImage(struct singleEntry * e Line 1654  int suitableImage(struct singleEntry * e
1654      }      }
1655    
1656      dev = getpathbyspec(dev);      dev = getpathbyspec(dev);
1657      if (!dev)      if (!getpathbyspec(dev)) {
1658            notSuitablePrintf(entry, "can't find blkid entry for %s\n", dev);
1659          return 0;          return 0;
1660        } else
1661     dev = getpathbyspec(dev);
1662    
1663      rootdev = findDiskForRoot();      rootdev = findDiskForRoot();
1664      if (!rootdev)      if (!rootdev) {
1665            notSuitablePrintf(entry, "can't find root device\n");
1666   return 0;   return 0;
1667        }
1668    
1669      if (!getuuidbydev(rootdev) || !getuuidbydev(dev)) {      if (!getuuidbydev(rootdev) || !getuuidbydev(dev)) {
1670            notSuitablePrintf(entry, "uuid missing: rootdev %s, dev %s\n",
1671     getuuidbydev(rootdev), getuuidbydev(dev));
1672          free(rootdev);          free(rootdev);
1673          return 0;          return 0;
1674      }      }
1675    
1676      if (strcmp(getuuidbydev(rootdev), getuuidbydev(dev))) {      if (strcmp(getuuidbydev(rootdev), getuuidbydev(dev))) {
1677            notSuitablePrintf(entry, "uuid mismatch: rootdev %s, dev %s\n",
1678     getuuidbydev(rootdev), getuuidbydev(dev));
1679   free(rootdev);   free(rootdev);
1680          return 0;          return 0;
1681      }      }
# Line 1450  struct singleEntry * findEntryByPath(str Line 1724  struct singleEntry * findEntryByPath(str
1724   entry = findEntryByIndex(config, indexVars[i]);   entry = findEntryByIndex(config, indexVars[i]);
1725   if (!entry) return NULL;   if (!entry) return NULL;
1726    
1727   line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
1728   if (!line) return NULL;   if (!line) return NULL;
1729    
1730   if (index) *index = indexVars[i];   if (index) *index = indexVars[i];
# Line 1488  struct singleEntry * findEntryByPath(str Line 1762  struct singleEntry * findEntryByPath(str
1762    
1763   if (!strncmp(kernel, "TITLE=", 6)) {   if (!strncmp(kernel, "TITLE=", 6)) {
1764      prefix = "";      prefix = "";
1765      checkType = LT_TITLE;      checkType = LT_TITLE|LT_MENUENTRY;
1766      kernel += 6;      kernel += 6;
1767   }   }
1768    
# Line 1499  struct singleEntry * findEntryByPath(str Line 1773  struct singleEntry * findEntryByPath(str
1773    
1774      /* check all the lines matching checkType */      /* check all the lines matching checkType */
1775      for (line = entry->lines; line; line = line->next) {      for (line = entry->lines; line; line = line->next) {
1776   line = getLineByType(entry->multiboot && checkType == LT_KERNEL ?   enum lineType_e ct = checkType;
1777       LT_KERNEL|LT_MBMODULE|LT_HYPER :   if (entry->multiboot && checkType == LT_KERNEL)
1778       checkType, line);      ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER;
1779   if (!line) break;  /* not found in this entry */   else if (checkType & LT_KERNEL)
1780        ct = checkType | LT_KERNEL_EFI;
1781     line = getLineByType(ct, line);
1782     if (!line)
1783        break;  /* not found in this entry */
1784    
1785   if (line && line->numElements >= 2) {   if (line && line->type != LT_MENUENTRY &&
1786     line->numElements >= 2) {
1787      rootspec = getRootSpecifier(line->elements[1].item);      rootspec = getRootSpecifier(line->elements[1].item);
1788      if (!strcmp(line->elements[1].item +      if (!strcmp(line->elements[1].item +
1789   ((rootspec != NULL) ? strlen(rootspec) : 0),   ((rootspec != NULL) ? strlen(rootspec) : 0),
1790   kernel + strlen(prefix)))   kernel + strlen(prefix)))
1791   break;   break;
1792   }   }
1793     if(line->type == LT_MENUENTRY &&
1794     !strcmp(line->elements[1].item, kernel))
1795        break;
1796      }      }
1797    
1798      /* make sure this entry has a kernel identifier; this skips      /* make sure this entry has a kernel identifier; this skips
1799       * non-Linux boot entries (could find netbsd etc, though, which is       * non-Linux boot entries (could find netbsd etc, though, which is
1800       * unfortunate)       * unfortunate)
1801       */       */
1802      if (line && getLineByType(LT_KERNEL|LT_HYPER, entry->lines))      if (line && getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines))
1803   break; /* found 'im! */   break; /* found 'im! */
1804   }   }
1805    
# Line 1602  void markRemovedImage(struct grubConfig Line 1884  void markRemovedImage(struct grubConfig
1884        const char * prefix) {        const char * prefix) {
1885      struct singleEntry * entry;      struct singleEntry * entry;
1886    
1887      if (!image) return;      if (!image)
1888     return;
1889    
1890        /* check and see if we're removing the default image */
1891        if (isdigit(*image)) {
1892     entry = findEntryByPath(cfg, image, prefix, NULL);
1893     if(entry)
1894        entry->skip = 1;
1895     return;
1896        }
1897    
1898      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))
1899   entry->skip = 1;   entry->skip = 1;
# Line 1610  void markRemovedImage(struct grubConfig Line 1901  void markRemovedImage(struct grubConfig
1901    
1902  void setDefaultImage(struct grubConfig * config, int hasNew,  void setDefaultImage(struct grubConfig * config, int hasNew,
1903       const char * defaultKernelPath, int newIsDefault,       const char * defaultKernelPath, int newIsDefault,
1904       const char * prefix, int flags) {       const char * prefix, int flags, int index) {
1905      struct singleEntry * entry, * entry2, * newDefault;      struct singleEntry * entry, * entry2, * newDefault;
1906      int i, j;      int i, j;
1907    
1908      if (newIsDefault) {      if (newIsDefault) {
1909   config->defaultImage = 0;   config->defaultImage = 0;
1910   return;   return;
1911        } else if ((index >= 0) && config->cfi->defaultIsIndex) {
1912     if (findEntryByIndex(config, index))
1913        config->defaultImage = index;
1914     else
1915        config->defaultImage = -1;
1916     return;
1917      } else if (defaultKernelPath) {      } else if (defaultKernelPath) {
1918   i = 0;   i = 0;
1919   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {
# Line 1629  void setDefaultImage(struct grubConfig * Line 1926  void setDefaultImage(struct grubConfig *
1926    
1927      /* 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
1928         changes */         changes */
1929      if (config->defaultImage == DEFAULT_SAVED)      if ((config->defaultImage == DEFAULT_SAVED) ||
1930     (config->defaultImage == DEFAULT_SAVED_GRUB2))
1931        /* default is set to saved, we don't want to change it */        /* default is set to saved, we don't want to change it */
1932        return;        return;
1933    
# Line 1690  void displayEntry(struct singleEntry * e Line 1988  void displayEntry(struct singleEntry * e
1988    
1989      printf("index=%d\n", index);      printf("index=%d\n", index);
1990    
1991      line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);      line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
1992      if (!line) {      if (!line) {
1993          printf("non linux entry\n");          printf("non linux entry\n");
1994          return;          return;
1995      }      }
1996    
1997      printf("kernel=%s\n", line->elements[1].item);      if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
1998     printf("kernel=%s\n", line->elements[1].item);
1999        else
2000     printf("kernel=%s%s\n", prefix, line->elements[1].item);
2001    
2002      if (line->numElements >= 3) {      if (line->numElements >= 3) {
2003   printf("args=\"");   printf("args=\"");
# Line 1752  void displayEntry(struct singleEntry * e Line 2053  void displayEntry(struct singleEntry * e
2053   printf("root=%s\n", s);   printf("root=%s\n", s);
2054      }      }
2055    
2056      line = getLineByType(LT_INITRD, entry->lines);      line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);
2057    
2058      if (line && line->numElements >= 2) {      if (line && line->numElements >= 2) {
2059   printf("initrd=%s", prefix);   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
2060        printf("initrd=");
2061     else
2062        printf("initrd=%s", prefix);
2063    
2064   for (i = 1; i < line->numElements; i++)   for (i = 1; i < line->numElements; i++)
2065      printf("%s%s", line->elements[i].item, line->elements[i].indent);      printf("%s%s", line->elements[i].item, line->elements[i].indent);
2066   printf("\n");   printf("\n");
2067      }      }
2068    
2069        line = getLineByType(LT_TITLE, entry->lines);
2070        if (line) {
2071     printf("title=%s\n", line->elements[1].item);
2072        } else {
2073     char * title;
2074     line = getLineByType(LT_MENUENTRY, entry->lines);
2075     title = grub2ExtractTitle(line);
2076     if (title)
2077        printf("title=%s\n", title);
2078        }
2079    }
2080    
2081    int isSuseSystem(void) {
2082        const char * path;
2083        const static char default_path[] = "/etc/SuSE-release";
2084    
2085        if ((path = getenv("GRUBBY_SUSE_RELEASE")) == NULL)
2086     path = default_path;
2087    
2088        if (!access(path, R_OK))
2089     return 1;
2090        return 0;
2091    }
2092    
2093    int isSuseGrubConf(const char * path) {
2094        FILE * grubConf;
2095        char * line = NULL;
2096        size_t len = 0, res = 0;
2097    
2098        grubConf = fopen(path, "r");
2099        if (!grubConf) {
2100            dbgPrintf("Could not open SuSE configuration file '%s'\n", path);
2101     return 0;
2102        }
2103    
2104        while ((res = getline(&line, &len, grubConf)) != -1) {
2105     if (!strncmp(line, "setup", 5)) {
2106        fclose(grubConf);
2107        free(line);
2108        return 1;
2109     }
2110        }
2111    
2112        dbgPrintf("SuSE configuration file '%s' does not appear to be valid\n",
2113          path);
2114    
2115        fclose(grubConf);
2116        free(line);
2117        return 0;
2118    }
2119    
2120    int suseGrubConfGetLba(const char * path, int * lbaPtr) {
2121        FILE * grubConf;
2122        char * line = NULL;
2123        size_t res = 0, len = 0;
2124    
2125        if (!path) return 1;
2126        if (!lbaPtr) return 1;
2127    
2128        grubConf = fopen(path, "r");
2129        if (!grubConf) return 1;
2130    
2131        while ((res = getline(&line, &len, grubConf)) != -1) {
2132     if (line[res - 1] == '\n')
2133        line[res - 1] = '\0';
2134     else if (len > res)
2135        line[res] = '\0';
2136     else {
2137        line = realloc(line, res + 1);
2138        line[res] = '\0';
2139     }
2140    
2141     if (!strncmp(line, "setup", 5)) {
2142        if (strstr(line, "--force-lba")) {
2143            *lbaPtr = 1;
2144        } else {
2145            *lbaPtr = 0;
2146        }
2147        dbgPrintf("lba: %i\n", *lbaPtr);
2148        break;
2149     }
2150        }
2151    
2152        free(line);
2153        fclose(grubConf);
2154        return 0;
2155    }
2156    
2157    int suseGrubConfGetInstallDevice(const char * path, char ** devicePtr) {
2158        FILE * grubConf;
2159        char * line = NULL;
2160        size_t res = 0, len = 0;
2161        char * lastParamPtr = NULL;
2162        char * secLastParamPtr = NULL;
2163        char installDeviceNumber = '\0';
2164        char * bounds = NULL;
2165    
2166        if (!path) return 1;
2167        if (!devicePtr) return 1;
2168    
2169        grubConf = fopen(path, "r");
2170        if (!grubConf) return 1;
2171    
2172        while ((res = getline(&line, &len, grubConf)) != -1) {
2173     if (strncmp(line, "setup", 5))
2174        continue;
2175    
2176     if (line[res - 1] == '\n')
2177        line[res - 1] = '\0';
2178     else if (len > res)
2179        line[res] = '\0';
2180     else {
2181        line = realloc(line, res + 1);
2182        line[res] = '\0';
2183     }
2184    
2185     lastParamPtr = bounds = line + res;
2186    
2187     /* Last parameter in grub may be an optional IMAGE_DEVICE */
2188     while (!isspace(*lastParamPtr))
2189        lastParamPtr--;
2190     lastParamPtr++;
2191    
2192     secLastParamPtr = lastParamPtr - 2;
2193     dbgPrintf("lastParamPtr: %s\n", lastParamPtr);
2194    
2195     if (lastParamPtr + 3 > bounds) {
2196        dbgPrintf("lastParamPtr going over boundary");
2197        fclose(grubConf);
2198        free(line);
2199        return 1;
2200     }
2201     if (!strncmp(lastParamPtr, "(hd", 3))
2202        lastParamPtr += 3;
2203     dbgPrintf("lastParamPtr: %c\n", *lastParamPtr);
2204    
2205     /*
2206     * Second last parameter will decide wether last parameter is
2207     * an IMAGE_DEVICE or INSTALL_DEVICE
2208     */
2209     while (!isspace(*secLastParamPtr))
2210        secLastParamPtr--;
2211     secLastParamPtr++;
2212    
2213     if (secLastParamPtr + 3 > bounds) {
2214        dbgPrintf("secLastParamPtr going over boundary");
2215        fclose(grubConf);
2216        free(line);
2217        return 1;
2218     }
2219     dbgPrintf("secLastParamPtr: %s\n", secLastParamPtr);
2220     if (!strncmp(secLastParamPtr, "(hd", 3)) {
2221        secLastParamPtr += 3;
2222        dbgPrintf("secLastParamPtr: %c\n", *secLastParamPtr);
2223        installDeviceNumber = *secLastParamPtr;
2224     } else {
2225        installDeviceNumber = *lastParamPtr;
2226     }
2227    
2228     *devicePtr = malloc(6);
2229     snprintf(*devicePtr, 6, "(hd%c)", installDeviceNumber);
2230     dbgPrintf("installDeviceNumber: %c\n", installDeviceNumber);
2231     fclose(grubConf);
2232     free(line);
2233     return 0;
2234        }
2235    
2236        free(line);
2237        fclose(grubConf);
2238        return 1;
2239    }
2240    
2241    int grubGetBootFromDeviceMap(const char * device,
2242         char ** bootPtr) {
2243        FILE * deviceMap;
2244        char * line = NULL;
2245        size_t res = 0, len = 0;
2246        char * devicePtr;
2247        char * bounds = NULL;
2248        const char * path;
2249        const static char default_path[] = "/boot/grub/device.map";
2250    
2251        if (!device) return 1;
2252        if (!bootPtr) return 1;
2253    
2254        if ((path = getenv("GRUBBY_GRUB_DEVICE_MAP")) == NULL)
2255     path = default_path;
2256    
2257        dbgPrintf("opening grub device.map file from: %s\n", path);
2258        deviceMap = fopen(path, "r");
2259        if (!deviceMap)
2260     return 1;
2261    
2262        while ((res = getline(&line, &len, deviceMap)) != -1) {
2263            if (!strncmp(line, "#", 1))
2264        continue;
2265    
2266     if (line[res - 1] == '\n')
2267        line[res - 1] = '\0';
2268     else if (len > res)
2269        line[res] = '\0';
2270     else {
2271        line = realloc(line, res + 1);
2272        line[res] = '\0';
2273     }
2274    
2275     devicePtr = line;
2276     bounds = line + res;
2277    
2278     while ((isspace(*line) && ((devicePtr + 1) <= bounds)))
2279        devicePtr++;
2280     dbgPrintf("device: %s\n", devicePtr);
2281    
2282     if (!strncmp(devicePtr, device, strlen(device))) {
2283        devicePtr += strlen(device);
2284        while (isspace(*devicePtr) && ((devicePtr + 1) <= bounds))
2285            devicePtr++;
2286    
2287        *bootPtr = strdup(devicePtr);
2288        break;
2289     }
2290        }
2291    
2292        free(line);
2293        fclose(deviceMap);
2294        return 0;
2295    }
2296    
2297    int suseGrubConfGetBoot(const char * path, char ** bootPtr) {
2298        char * grubDevice;
2299    
2300        if (suseGrubConfGetInstallDevice(path, &grubDevice))
2301     dbgPrintf("error looking for grub installation device\n");
2302        else
2303     dbgPrintf("grubby installation device: %s\n", grubDevice);
2304    
2305        if (grubGetBootFromDeviceMap(grubDevice, bootPtr))
2306     dbgPrintf("error looking for grub boot device\n");
2307        else
2308     dbgPrintf("grubby boot device: %s\n", *bootPtr);
2309    
2310        free(grubDevice);
2311        return 0;
2312    }
2313    
2314    int parseSuseGrubConf(int * lbaPtr, char ** bootPtr) {
2315        /*
2316         * This SuSE grub configuration file at this location is not your average
2317         * grub configuration file, but instead the grub commands used to setup
2318         * grub on that system.
2319         */
2320        const char * path;
2321        const static char default_path[] = "/etc/grub.conf";
2322    
2323        if ((path = getenv("GRUBBY_SUSE_GRUB_CONF")) == NULL)
2324     path = default_path;
2325    
2326        if (!isSuseGrubConf(path)) return 1;
2327    
2328        if (lbaPtr) {
2329            *lbaPtr = 0;
2330            if (suseGrubConfGetLba(path, lbaPtr))
2331                return 1;
2332        }
2333    
2334        if (bootPtr) {
2335            *bootPtr = NULL;
2336            suseGrubConfGetBoot(path, bootPtr);
2337        }
2338    
2339        return 0;
2340  }  }
2341    
2342  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {
# Line 1810  int parseSysconfigGrub(int * lbaPtr, cha Line 2387  int parseSysconfigGrub(int * lbaPtr, cha
2387  }  }
2388    
2389  void dumpSysconfigGrub(void) {  void dumpSysconfigGrub(void) {
2390      char * boot;      char * boot = NULL;
2391      int lba;      int lba;
2392    
2393      if (!parseSysconfigGrub(&lba, &boot)) {      if (isSuseSystem()) {
2394   if (lba) printf("lba\n");          if (parseSuseGrubConf(&lba, &boot)) {
2395   if (boot) printf("boot=%s\n", boot);      free(boot);
2396        return;
2397     }
2398        } else {
2399            if (parseSysconfigGrub(&lba, &boot)) {
2400        free(boot);
2401        return;
2402     }
2403        }
2404    
2405        if (lba) printf("lba\n");
2406        if (boot) {
2407     printf("boot=%s\n", boot);
2408     free(boot);
2409      }      }
2410  }  }
2411    
# Line 1864  struct singleLine * addLineTmpl(struct s Line 2454  struct singleLine * addLineTmpl(struct s
2454  {  {
2455      struct singleLine * newLine = lineDup(tmplLine);      struct singleLine * newLine = lineDup(tmplLine);
2456    
2457        if (isEfi && cfi == &grub2ConfigType) {
2458     enum lineType_e old = newLine->type;
2459     newLine->type = preferredLineType(newLine->type, cfi);
2460     if (old != newLine->type)
2461        newLine->elements[0].item = getKeyByType(newLine->type, cfi);
2462        }
2463    
2464      if (val) {      if (val) {
2465   /* override the inherited value with our own.   /* override the inherited value with our own.
2466   * This is a little weak because it only applies to elements[1]   * This is a little weak because it only applies to elements[1]
# Line 1873  struct singleLine * addLineTmpl(struct s Line 2470  struct singleLine * addLineTmpl(struct s
2470   insertElement(newLine, val, 1, cfi);   insertElement(newLine, val, 1, cfi);
2471    
2472   /* but try to keep the rootspec from the template... sigh */   /* but try to keep the rootspec from the template... sigh */
2473   if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD)) {   if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD|LT_KERNEL_EFI|LT_INITRD_EFI)) {
2474      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);
2475      if (rootspec != NULL) {      if (rootspec != NULL) {
2476   free(newLine->elements[1].item);   free(newLine->elements[1].item);
# Line 1910  struct singleLine *  addLine(struct sing Line 2507  struct singleLine *  addLine(struct sing
2507      /* NB: This function shouldn't allocate items on the heap, rather on the      /* NB: This function shouldn't allocate items on the heap, rather on the
2508       * stack since it calls addLineTmpl which will make copies.       * stack since it calls addLineTmpl which will make copies.
2509       */       */
   
2510      if (type == LT_TITLE && cfi->titleBracketed) {      if (type == LT_TITLE && cfi->titleBracketed) {
2511   /* we're doing a bracketed title (zipl) */   /* we're doing a bracketed title (zipl) */
2512   tmpl.type = type;   tmpl.type = type;
# Line 2014  void removeLine(struct singleEntry * ent Line 2610  void removeLine(struct singleEntry * ent
2610      free(line);      free(line);
2611  }  }
2612    
 static int isquote(char q)  
 {  
     if (q == '\'' || q == '\"')  
  return 1;  
     return 0;  
 }  
   
2613  static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)  static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)
2614  {  {
2615      struct singleLine newLine = {      struct singleLine newLine = {
# Line 2251  int updateActualImage(struct grubConfig Line 2840  int updateActualImage(struct grubConfig
2840      firstElement = 2;      firstElement = 2;
2841    
2842   } else {   } else {
2843      line = getLineByType(LT_KERNEL|LT_MBMODULE, entry->lines);      line = getLineByType(LT_KERNEL|LT_MBMODULE|LT_KERNEL_EFI, entry->lines);
2844      if (!line) {      if (!line) {
2845   /* no LT_KERNEL or LT_MBMODULE in this entry? */   /* no LT_KERNEL or LT_MBMODULE in this entry? */
2846   continue;   continue;
# Line 2416  int updateInitrd(struct grubConfig * cfg Line 3005  int updateInitrd(struct grubConfig * cfg
3005      if (!image) return 0;      if (!image) return 0;
3006    
3007      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
3008          kernelLine = getLineByType(LT_KERNEL, entry->lines);          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI, entry->lines);
3009          if (!kernelLine) continue;          if (!kernelLine) continue;
3010    
3011          line = getLineByType(LT_INITRD, entry->lines);          line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);
3012          if (line)          if (line)
3013              removeLine(entry, line);              removeLine(entry, line);
3014          if (prefix) {          if (prefix) {
# Line 2430  int updateInitrd(struct grubConfig * cfg Line 3019  int updateInitrd(struct grubConfig * cfg
3019   endLine = getLineByType(LT_ENTRY_END, entry->lines);   endLine = getLineByType(LT_ENTRY_END, entry->lines);
3020   if (endLine)   if (endLine)
3021      removeLine(entry, endLine);      removeLine(entry, endLine);
3022          line = addLine(entry, cfg->cfi, LT_INITRD, kernelLine->indent, initrd);          line = addLine(entry, cfg->cfi, preferredLineType(LT_INITRD, cfg->cfi),
3023     kernelLine->indent, initrd);
3024          if (!line)          if (!line)
3025      return 1;      return 1;
3026   if (endLine) {   if (endLine) {
# Line 2468  int checkDeviceBootloader(const char * d Line 3058  int checkDeviceBootloader(const char * d
3058      if (memcmp(boot, bootSect, 3))      if (memcmp(boot, bootSect, 3))
3059   return 0;   return 0;
3060    
3061      if (boot[1] == 0xeb) {      if (boot[1] == JMP_SHORT_OPCODE) {
3062   offset = boot[2] + 2;   offset = boot[2] + 2;
3063      } else if (boot[1] == 0xe8 || boot[1] == 0xe9) {      } else if (boot[1] == 0xe8 || boot[1] == 0xe9) {
3064   offset = (boot[3] << 8) + boot[2] + 2;   offset = (boot[3] << 8) + boot[2] + 2;
3065      } else if (boot[0] == 0xeb) {      } else if (boot[0] == JMP_SHORT_OPCODE) {
3066   offset = boot[1] + 2;        offset = boot[1] + 2;
3067            /*
3068     * it looks like grub, when copying stage1 into the mbr, patches stage1
3069     * right after the JMP location, replacing other instructions such as
3070     * JMPs for NOOPs. So, relax the check a little bit by skipping those
3071     * different bytes.
3072     */
3073          if ((bootSect[offset + 1] == NOOP_OPCODE)
3074      && (bootSect[offset + 2] == NOOP_OPCODE)) {
3075     offset = offset + 3;
3076          }
3077      } else if (boot[0] == 0xe8 || boot[0] == 0xe9) {      } else if (boot[0] == 0xe8 || boot[0] == 0xe9) {
3078   offset = (boot[2] << 8) + boot[1] + 2;   offset = (boot[2] << 8) + boot[1] + 2;
3079      } else {      } else {
# Line 2626  int checkForGrub(struct grubConfig * con Line 3226  int checkForGrub(struct grubConfig * con
3226      int fd;      int fd;
3227      unsigned char bootSect[512];      unsigned char bootSect[512];
3228      char * boot;      char * boot;
3229        int onSuse = isSuseSystem();
3230    
3231      if (parseSysconfigGrub(NULL, &boot))  
3232   return 0;      if (onSuse) {
3233     if (parseSuseGrubConf(NULL, &boot))
3234        return 0;
3235        } else {
3236     if (parseSysconfigGrub(NULL, &boot))
3237        return 0;
3238        }
3239    
3240      /* assume grub is not installed -- not an error condition */      /* assume grub is not installed -- not an error condition */
3241      if (!boot)      if (!boot)
# Line 2647  int checkForGrub(struct grubConfig * con Line 3254  int checkForGrub(struct grubConfig * con
3254      }      }
3255      close(fd);      close(fd);
3256    
3257        /* The more elaborate checks do not work on SuSE. The checks done
3258         * seem to be reasonble (at least for now), so just return success
3259         */
3260        if (onSuse)
3261     return 2;
3262    
3263      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
3264  }  }
3265    
# Line 2680  int checkForExtLinux(struct grubConfig * Line 3293  int checkForExtLinux(struct grubConfig *
3293      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
3294  }  }
3295    
3296    int checkForYaboot(struct grubConfig * config) {
3297        /*
3298         * This is a simplistic check that we consider good enough for own puporses
3299         *
3300         * If we were to properly check if yaboot is *installed* we'd need to:
3301         * 1) get the system boot device (LT_BOOT)
3302         * 2) considering it's a raw filesystem, check if the yaboot binary matches
3303         *    the content on the boot device
3304         * 3) if not, copy the binary to a temporary file and run "addnote" on it
3305         * 4) check again if binary and boot device contents match
3306         */
3307        if (!access("/etc/yaboot.conf", R_OK))
3308     return 2;
3309    
3310        return 1;
3311    }
3312    
3313    int checkForElilo(struct grubConfig * config) {
3314        if (!access("/etc/elilo.conf", R_OK))
3315     return 2;
3316    
3317        return 1;
3318    }
3319    
3320  static char * getRootSpecifier(char * str) {  static char * getRootSpecifier(char * str) {
3321      char * idx, * rootspec = NULL;      char * idx, * rootspec = NULL;
3322    
# Line 2694  static char * getRootSpecifier(char * st Line 3331  static char * getRootSpecifier(char * st
3331  static char * getInitrdVal(struct grubConfig * config,  static char * getInitrdVal(struct grubConfig * config,
3332     const char * prefix, struct singleLine *tmplLine,     const char * prefix, struct singleLine *tmplLine,
3333     const char * newKernelInitrd,     const char * newKernelInitrd,
3334     char ** extraInitrds, int extraInitrdCount)     const char ** extraInitrds, int extraInitrdCount)
3335  {  {
3336      char *initrdVal, *end;      char *initrdVal, *end;
3337      int i;      int i;
# Line 2739  static char * getInitrdVal(struct grubCo Line 3376  static char * getInitrdVal(struct grubCo
3376    
3377  int addNewKernel(struct grubConfig * config, struct singleEntry * template,  int addNewKernel(struct grubConfig * config, struct singleEntry * template,
3378           const char * prefix,           const char * prefix,
3379   char * newKernelPath, char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
3380   char * newKernelArgs, char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
3381   char ** extraInitrds, int extraInitrdCount,   const char ** extraInitrds, int extraInitrdCount,
3382                   char * newMBKernel, char * newMBKernelArgs) {                   const char * newMBKernel, const char * newMBKernelArgs) {
3383      struct singleEntry * new;      struct singleEntry * new;
3384      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
3385      int needs;      int needs;
# Line 2796  int addNewKernel(struct grubConfig * con Line 3433  int addNewKernel(struct grubConfig * con
3433      while (*chptr && isspace(*chptr)) chptr++;      while (*chptr && isspace(*chptr)) chptr++;
3434      if (*chptr == '#') continue;      if (*chptr == '#') continue;
3435    
3436      if (tmplLine->type == LT_KERNEL &&      if (iskernel(tmplLine->type) && tmplLine->numElements >= 2) {
     tmplLine->numElements >= 2) {  
3437   if (!template->multiboot && (needs & NEED_MB)) {   if (!template->multiboot && (needs & NEED_MB)) {
3438      /* it's not a multiboot template and this is the kernel      /* it's not a multiboot template and this is the kernel
3439       * line.  Try to be intelligent about inserting the       * line.  Try to be intelligent about inserting the
# Line 2874  int addNewKernel(struct grubConfig * con Line 3510  int addNewKernel(struct grubConfig * con
3510      /* template is multi but new is not,      /* template is multi but new is not,
3511       * insert the kernel in the first module slot       * insert the kernel in the first module slot
3512       */       */
3513      tmplLine->type = LT_KERNEL;      tmplLine->type = preferredLineType(LT_KERNEL, config->cfi);
3514      free(tmplLine->elements[0].item);      free(tmplLine->elements[0].item);
3515      tmplLine->elements[0].item =      tmplLine->elements[0].item =
3516   strdup(getKeywordByType(LT_KERNEL, config->cfi)->key);   strdup(getKeywordByType(tmplLine->type,
3517     config->cfi)->key);
3518      newLine = addLineTmpl(new, tmplLine, newLine,      newLine = addLineTmpl(new, tmplLine, newLine,
3519    newKernelPath + strlen(prefix), config->cfi);    newKernelPath + strlen(prefix),
3520      config->cfi);
3521      needs &= ~NEED_KERNEL;      needs &= ~NEED_KERNEL;
3522   } else if (needs & NEED_INITRD) {   } else if (needs & NEED_INITRD) {
3523      char *initrdVal;      char *initrdVal;
3524      /* template is multi but new is not,      /* template is multi but new is not,
3525       * insert the initrd in the second module slot       * insert the initrd in the second module slot
3526       */       */
3527      tmplLine->type = LT_INITRD;      tmplLine->type = preferredLineType(LT_INITRD, config->cfi);
3528      free(tmplLine->elements[0].item);      free(tmplLine->elements[0].item);
3529      tmplLine->elements[0].item =      tmplLine->elements[0].item =
3530   strdup(getKeywordByType(LT_INITRD, config->cfi)->key);   strdup(getKeywordByType(tmplLine->type,
3531     config->cfi)->key);
3532      initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);      initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);
3533      newLine = addLineTmpl(new, tmplLine, newLine, initrdVal, config->cfi);      newLine = addLineTmpl(new, tmplLine, newLine, initrdVal, config->cfi);
3534      free(initrdVal);      free(initrdVal);
3535      needs &= ~NEED_INITRD;      needs &= ~NEED_INITRD;
3536   }   }
3537    
3538      } else if (tmplLine->type == LT_INITRD &&      } else if (isinitrd(tmplLine->type) && tmplLine->numElements >= 2) {
        tmplLine->numElements >= 2) {  
3539   if (needs & NEED_INITRD &&   if (needs & NEED_INITRD &&
3540      new->multiboot && !template->multiboot &&      new->multiboot && !template->multiboot &&
3541      config->cfi->mbInitRdIsModule) {      config->cfi->mbInitRdIsModule) {
# Line 2948  int addNewKernel(struct grubConfig * con Line 3586  int addNewKernel(struct grubConfig * con
3586   }   }
3587      } else if (tmplLine->type == LT_ECHO) {      } else if (tmplLine->type == LT_ECHO) {
3588      requote(tmplLine, config->cfi);      requote(tmplLine, config->cfi);
3589        static const char *prefix = "'Loading ";
3590      if (tmplLine->numElements > 1 &&      if (tmplLine->numElements > 1 &&
3591      strstr(tmplLine->elements[1].item, "'Loading Linux ")) {      strstr(tmplLine->elements[1].item, prefix) &&
3592   char *prefix = "'Loading ";      masterLine->next &&
3593        iskernel(masterLine->next->type)) {
3594   char *newTitle = malloc(strlen(prefix) +   char *newTitle = malloc(strlen(prefix) +
3595   strlen(newKernelTitle) + 2);   strlen(newKernelTitle) + 2);
3596    
# Line 2977  int addNewKernel(struct grubConfig * con Line 3617  int addNewKernel(struct grubConfig * con
3617   */   */
3618   switch (config->cfi->entryStart) {   switch (config->cfi->entryStart) {
3619      case LT_KERNEL:      case LT_KERNEL:
3620        case LT_KERNEL_EFI:
3621   if (new->multiboot && config->cfi->mbHyperFirst) {   if (new->multiboot && config->cfi->mbHyperFirst) {
3622      /* fall through to LT_HYPER */      /* fall through to LT_HYPER */
3623   } else {   } else {
3624      newLine = addLine(new, config->cfi, LT_KERNEL,      newLine = addLine(new, config->cfi,
3625              preferredLineType(LT_KERNEL, config->cfi),
3626        config->primaryIndent,        config->primaryIndent,
3627        newKernelPath + strlen(prefix));        newKernelPath + strlen(prefix));
3628      needs &= ~NEED_KERNEL;      needs &= ~NEED_KERNEL;
# Line 3056  int addNewKernel(struct grubConfig * con Line 3698  int addNewKernel(struct grubConfig * con
3698      if (needs & NEED_KERNEL) {      if (needs & NEED_KERNEL) {
3699   newLine = addLine(new, config->cfi,   newLine = addLine(new, config->cfi,
3700    (new->multiboot && getKeywordByType(LT_MBMODULE,    (new->multiboot && getKeywordByType(LT_MBMODULE,
3701        config->cfi)) ?        config->cfi))
3702    LT_MBMODULE : LT_KERNEL,     ? LT_MBMODULE
3703     : preferredLineType(LT_KERNEL, config->cfi),
3704    config->secondaryIndent,    config->secondaryIndent,
3705    newKernelPath + strlen(prefix));    newKernelPath + strlen(prefix));
3706   needs &= ~NEED_KERNEL;   needs &= ~NEED_KERNEL;
# Line 3073  int addNewKernel(struct grubConfig * con Line 3716  int addNewKernel(struct grubConfig * con
3716   initrdVal = getInitrdVal(config, prefix, NULL, newKernelInitrd, extraInitrds, extraInitrdCount);   initrdVal = getInitrdVal(config, prefix, NULL, newKernelInitrd, extraInitrds, extraInitrdCount);
3717   newLine = addLine(new, config->cfi,   newLine = addLine(new, config->cfi,
3718    (new->multiboot && getKeywordByType(LT_MBMODULE,    (new->multiboot && getKeywordByType(LT_MBMODULE,
3719        config->cfi)) ?        config->cfi))
3720    LT_MBMODULE : LT_INITRD,     ? LT_MBMODULE
3721       : preferredLineType(LT_INITRD, config->cfi),
3722    config->secondaryIndent,    config->secondaryIndent,
3723    initrdVal);    initrdVal);
3724   free(initrdVal);   free(initrdVal);
# Line 3147  int main(int argc, const char ** argv) { Line 3791  int main(int argc, const char ** argv) {
3791      struct singleEntry * template = NULL;      struct singleEntry * template = NULL;
3792      int copyDefault = 0, makeDefault = 0;      int copyDefault = 0, makeDefault = 0;
3793      int displayDefault = 0;      int displayDefault = 0;
3794        int displayDefaultIndex = 0;
3795        int displayDefaultTitle = 0;
3796        int defaultIndex = -1;
3797      struct poptOption options[] = {      struct poptOption options[] = {
3798   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,
3799      _("add an entry for the specified kernel"), _("kernel-path") },      _("add an entry for the specified kernel"), _("kernel-path") },
# Line 3164  int main(int argc, const char ** argv) { Line 3811  int main(int argc, const char ** argv) {
3811   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
3812      _("filestystem which contains /boot directory (for testing only)"),      _("filestystem which contains /boot directory (for testing only)"),
3813      _("bootfs") },      _("bootfs") },
3814  #if defined(__i386__) || defined(__x86_64__)  #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
3815   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
3816      _("check if lilo is installed on lilo.conf boot sector") },      _("check which bootloader is installed on boot sector") },
3817  #endif  #endif
3818   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,
3819      _("path to grub config file to update (\"-\" for stdin)"),      _("path to grub config file to update (\"-\" for stdin)"),
# Line 3177  int main(int argc, const char ** argv) { Line 3824  int main(int argc, const char ** argv) {
3824        "the kernel referenced by the default image does not exist, "        "the kernel referenced by the default image does not exist, "
3825        "the first linux entry whose kernel does exist is used as the "        "the first linux entry whose kernel does exist is used as the "
3826        "template"), NULL },        "template"), NULL },
3827     { "debug", 0, 0, &debug, 0,
3828        _("print debugging information for failures") },
3829   { "default-kernel", 0, 0, &displayDefault, 0,   { "default-kernel", 0, 0, &displayDefault, 0,
3830      _("display the path of the default kernel") },      _("display the path of the default kernel") },
3831     { "default-index", 0, 0, &displayDefaultIndex, 0,
3832        _("display the index of the default kernel") },
3833     { "default-title", 0, 0, &displayDefaultTitle, 0,
3834        _("display the title of the default kernel") },
3835   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
3836      _("configure elilo bootloader") },      _("configure elilo bootloader") },
3837     { "efi", 0, POPT_ARG_NONE, &isEfi, 0,
3838        _("force grub2 stanzas to use efi") },
3839   { "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,   { "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,
3840      _("configure extlinux bootloader (from syslinux)") },      _("configure extlinux bootloader (from syslinux)") },
3841   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,
# Line 3213  int main(int argc, const char ** argv) { Line 3868  int main(int argc, const char ** argv) {
3868   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,
3869      _("make the first entry referencing the specified kernel "      _("make the first entry referencing the specified kernel "
3870        "the default"), _("kernel-path") },        "the default"), _("kernel-path") },
3871     { "set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,
3872        _("make the given entry index the default entry"),
3873        _("entry-index") },
3874   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,
3875      _("configure silo bootloader") },      _("configure silo bootloader") },
3876   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,
# Line 3295  int main(int argc, const char ** argv) { Line 3953  int main(int argc, const char ** argv) {
3953      }      }
3954    
3955      if (!cfi) {      if (!cfi) {
3956            if (grub2FindConfig(&grub2ConfigType))
3957        cfi = &grub2ConfigType;
3958     else
3959        #ifdef __ia64__        #ifdef __ia64__
3960   cfi = &eliloConfigType;      cfi = &eliloConfigType;
3961        #elif __powerpc__        #elif __powerpc__
3962   cfi = &yabootConfigType;      cfi = &yabootConfigType;
3963        #elif __sparc__        #elif __sparc__
3964          cfi = &siloConfigType;              cfi = &siloConfigType;
3965        #elif __s390__        #elif __s390__
3966          cfi = &ziplConfigType;              cfi = &ziplConfigType;
3967        #elif __s390x__        #elif __s390x__
3968          cfi = &ziplConfigtype;              cfi = &ziplConfigtype;
3969        #else        #else
         if (grub2FindConfig(&grub2ConfigType))  
     cfi = &grub2ConfigType;  
  else  
3970      cfi = &grubConfigType;      cfi = &grubConfigType;
3971        #endif        #endif
3972      }      }
# Line 3321  int main(int argc, const char ** argv) { Line 3979  int main(int argc, const char ** argv) {
3979      }      }
3980    
3981      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||
3982    newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
3983    defaultKernel)) {      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
3984        (defaultIndex >= 0))) {
3985   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
3986    "specified option"));    "specified option"));
3987   return 1;   return 1;
# Line 3364  int main(int argc, const char ** argv) { Line 4023  int main(int argc, const char ** argv) {
4023   makeDefault = 1;   makeDefault = 1;
4024   defaultKernel = NULL;   defaultKernel = NULL;
4025      }      }
4026        else if (defaultKernel && (defaultIndex >= 0)) {
4027     fprintf(stderr, _("grubby: --set-default and --set-default-index "
4028      "may not be used together\n"));
4029     return 1;
4030        }
4031    
4032      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {
4033   fprintf(stderr, _("grubby: output file must be specified if stdin "   fprintf(stderr, _("grubby: output file must be specified if stdin "
# Line 3372  int main(int argc, const char ** argv) { Line 4036  int main(int argc, const char ** argv) {
4036      }      }
4037    
4038      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
4039   && !kernelInfo && !bootloaderProbe && !updateKernelPath   && !kernelInfo && !bootloaderProbe && !updateKernelPath
4040          && !removeMBKernel) {   && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle
4041     && (defaultIndex == -1)) {
4042   fprintf(stderr, _("grubby: no action specified\n"));   fprintf(stderr, _("grubby: no action specified\n"));
4043   return 1;   return 1;
4044      }      }
# Line 3400  int main(int argc, const char ** argv) { Line 4065  int main(int argc, const char ** argv) {
4065      }      }
4066    
4067      if (bootloaderProbe) {      if (bootloaderProbe) {
4068   int lrc = 0, grc = 0, gr2c = 0, erc = 0;   int lrc = 0, grc = 0, gr2c = 0, extrc = 0, yrc = 0, erc = 0;
4069   struct grubConfig * lconfig, * gconfig;   struct grubConfig * lconfig, * gconfig, * yconfig, * econfig;
4070    
4071   const char *grub2config = grub2FindConfig(&grub2ConfigType);   const char *grub2config = grub2FindConfig(&grub2ConfigType);
4072   if (grub2config) {   if (grub2config) {
# Line 3429  int main(int argc, const char ** argv) { Line 4094  int main(int argc, const char ** argv) {
4094   lrc = checkForLilo(lconfig);   lrc = checkForLilo(lconfig);
4095   }   }
4096    
4097     if (!access(eliloConfigType.defaultConfig, F_OK)) {
4098        econfig = readConfig(eliloConfigType.defaultConfig,
4099     &eliloConfigType);
4100        if (!econfig)
4101     erc = 1;
4102        else
4103     erc = checkForElilo(econfig);
4104     }
4105    
4106   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {
4107      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);
4108      if (!lconfig)      if (!lconfig)
4109   erc = 1;   extrc = 1;
4110      else      else
4111   erc = checkForExtLinux(lconfig);   extrc = checkForExtLinux(lconfig);
4112   }   }
4113    
4114   if (lrc == 1 || grc == 1 || gr2c == 1) return 1;  
4115     if (!access(yabootConfigType.defaultConfig, F_OK)) {
4116        yconfig = readConfig(yabootConfigType.defaultConfig,
4117     &yabootConfigType);
4118        if (!yconfig)
4119     yrc = 1;
4120        else
4121     yrc = checkForYaboot(yconfig);
4122     }
4123    
4124     if (lrc == 1 || grc == 1 || gr2c == 1 || extrc == 1 || yrc == 1 ||
4125     erc == 1)
4126        return 1;
4127    
4128   if (lrc == 2) printf("lilo\n");   if (lrc == 2) printf("lilo\n");
4129   if (gr2c == 2) printf("grub2\n");   if (gr2c == 2) printf("grub2\n");
4130   if (grc == 2) printf("grub\n");   if (grc == 2) printf("grub\n");
4131   if (erc == 2) printf("extlinux\n");   if (extrc == 2) printf("extlinux\n");
4132     if (yrc == 2) printf("yaboot\n");
4133     if (erc == 2) printf("elilo\n");
4134    
4135   return 0;   return 0;
4136      }      }
# Line 3460  int main(int argc, const char ** argv) { Line 4148  int main(int argc, const char ** argv) {
4148   if (!entry) return 0;   if (!entry) return 0;
4149   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
4150    
4151   line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
4152   if (!line) return 0;   if (!line) return 0;
4153    
4154          rootspec = getRootSpecifier(line->elements[1].item);          rootspec = getRootSpecifier(line->elements[1].item);
# Line 3468  int main(int argc, const char ** argv) { Line 4156  int main(int argc, const char ** argv) {
4156                 ((rootspec != NULL) ? strlen(rootspec) : 0));                 ((rootspec != NULL) ? strlen(rootspec) : 0));
4157    
4158   return 0;   return 0;
4159    
4160        } else if (displayDefaultTitle) {
4161     struct singleLine * line;
4162     struct singleEntry * entry;
4163    
4164     if (config->defaultImage == -1) return 0;
4165     entry = findEntryByIndex(config, config->defaultImage);
4166     if (!entry) return 0;
4167    
4168     if (!configureGrub2) {
4169      line = getLineByType(LT_TITLE, entry->lines);
4170      if (!line) return 0;
4171      printf("%s\n", line->elements[1].item);
4172    
4173     } else {
4174      char * title;
4175    
4176      dbgPrintf("This is GRUB2, default title is embeded in menuentry\n");
4177      line = getLineByType(LT_MENUENTRY, entry->lines);
4178      if (!line) return 0;
4179      title = grub2ExtractTitle(line);
4180      if (title)
4181        printf("%s\n", title);
4182     }
4183     return 0;
4184    
4185        } else if (displayDefaultIndex) {
4186            if (config->defaultImage == -1) return 0;
4187            printf("%i\n", config->defaultImage);
4188    
4189      } else if (kernelInfo)      } else if (kernelInfo)
4190   return displayInfo(config, kernelInfo, bootPrefix);   return displayInfo(config, kernelInfo, bootPrefix);
4191    
# Line 3479  int main(int argc, const char ** argv) { Line 4197  int main(int argc, const char ** argv) {
4197      markRemovedImage(config, removeKernelPath, bootPrefix);      markRemovedImage(config, removeKernelPath, bootPrefix);
4198      markRemovedImage(config, removeMBKernel, bootPrefix);      markRemovedImage(config, removeMBKernel, bootPrefix);
4199      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,
4200      bootPrefix, flags);      bootPrefix, flags, defaultIndex);
4201      setFallbackImage(config, newKernelPath != NULL);      setFallbackImage(config, newKernelPath != NULL);
4202      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
4203                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
# Line 3489  int main(int argc, const char ** argv) { Line 4207  int main(int argc, const char ** argv) {
4207      }      }
4208      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
4209                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
4210                       extraInitrds, extraInitrdCount,                       (const char **)extraInitrds, extraInitrdCount,
4211                       newMBKernel, newMBKernelArgs)) return 1;                       newMBKernel, newMBKernelArgs)) return 1;
4212            
4213    

Legend:
Removed from v.1717  
changed lines
  Added in v.2052