Magellan Linux

Diff of /trunk/grubby/grubby.c

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

revision 2687 by niro, Wed Jul 16 10:41:38 2014 UTC revision 2962 by niro, Wed Jun 29 14:40:57 2016 UTC
# Line 60  int debug = 0; /* Currently just for tem Line 60  int debug = 0; /* Currently just for tem
60    
61  int isEfi = 0;  int isEfi = 0;
62    
63    #if defined(__aarch64__)
64    #define isEfiOnly 1
65    #else
66    #define isEfiOnly 0
67    #endif
68    
69  char *saved_command_line = NULL;  char *saved_command_line = NULL;
70    
71  /* comments get lumped in with indention */  /* comments get lumped in with indention */
# Line 155  struct configFileInfo { Line 161  struct configFileInfo {
161      int defaultIsVariable;      int defaultIsVariable;
162      int defaultSupportSaved;      int defaultSupportSaved;
163      int defaultIsSaved;      int defaultIsSaved;
164        int defaultIsUnquoted;
165      enum lineType_e entryStart;      enum lineType_e entryStart;
166      enum lineType_e entryEnd;      enum lineType_e entryEnd;
167      int needsBootPrefix;      int needsBootPrefix;
# Line 630  struct configFileInfo extlinuxConfigType Line 637  struct configFileInfo extlinuxConfigType
637      .needsBootPrefix = 1,      .needsBootPrefix = 1,
638      .maxTitleLength = 255,      .maxTitleLength = 255,
639      .mbAllowExtraInitRds = 1,      .mbAllowExtraInitRds = 1,
640        .defaultIsUnquoted = 1,
641  };  };
642    
643  struct grubConfig {  struct grubConfig {
# Line 720  static enum lineType_e preferredLineType Line 728  static enum lineType_e preferredLineType
728   struct configFileInfo *cfi) {   struct configFileInfo *cfi) {
729      if (isEfi && cfi == &grub2ConfigType) {      if (isEfi && cfi == &grub2ConfigType) {
730   switch (type) {   switch (type) {
 #if defined(__aarch64__)  
731   case LT_KERNEL:   case LT_KERNEL:
732      return LT_KERNEL;      return isEfiOnly ? LT_KERNEL : LT_KERNEL_EFI;
733   case LT_INITRD:   case LT_INITRD:
734      return LT_INITRD;      return isEfiOnly ? LT_INITRD : LT_INITRD_EFI;
 #else  
  case LT_KERNEL:  
     return LT_KERNEL_EFI;  
  case LT_INITRD:  
     return LT_INITRD_EFI;  
 #endif  
735   default:   default:
736      return type;      return type;
737   }   }
# Line 1192  static struct grubConfig * readConfig(co Line 1193  static struct grubConfig * readConfig(co
1193   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
1194   defaultLine = line;   defaultLine = line;
1195      }      }
  } else if (line->type == LT_DEFAULT && line->numElements == 2) {  
     cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;  
     defaultLine = line;  
1196    
1197          } else if (iskernel(line->type)) {          } else if (iskernel(line->type)) {
1198      /* if by some freak chance this is multiboot and the "module"      /* if by some freak chance this is multiboot and the "module"
1199       * lines came earlier in the template, make sure to use LT_HYPER       * lines came earlier in the template, make sure to use LT_HYPER
1200       * instead of LT_KERNEL now       * instead of LT_KERNEL now
1201       */       */
1202      if (entry->multiboot)      if (entry && entry->multiboot)
1203   line->type = LT_HYPER;   line->type = LT_HYPER;
1204    
1205          } else if (line->type == LT_MBMODULE) {          } else if (line->type == LT_MBMODULE) {
# Line 1227  static struct grubConfig * readConfig(co Line 1225  static struct grubConfig * readConfig(co
1225      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);
1226      if (*end) cfg->fallbackImage = -1;      if (*end) cfg->fallbackImage = -1;
1227    
1228   } else if (line->type == LT_TITLE && line->numElements > 1) {   } else if ((line->type == LT_DEFAULT && cfi->defaultIsUnquoted) ||
1229      /* make the title a single argument (undoing our parsing) */                  (line->type == LT_TITLE && line->numElements > 1)) {
1230        /* make the title/default a single argument (undoing our parsing) */
1231      len = 0;      len = 0;
1232      for (int i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
1233   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
# Line 1335  static struct grubConfig * readConfig(co Line 1334  static struct grubConfig * readConfig(co
1334      }      }
1335   }   }
1336    
1337     if (line->type == LT_DEFAULT && line->numElements == 2) {
1338        cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
1339        defaultLine = line;
1340     }
1341    
1342   /* If we find a generic config option which should live at the   /* If we find a generic config option which should live at the
1343     top of the file, move it there. Old versions of grubby were     top of the file, move it there. Old versions of grubby were
1344     probably responsible for putting new images in the wrong     probably responsible for putting new images in the wrong
# Line 1956  struct singleEntry * findEntryByPath(str Line 1960  struct singleEntry * findEntryByPath(str
1960   }   }
1961    
1962   indexVars[i + 1] = -1;   indexVars[i + 1] = -1;
1963    
1964   i = 0;   i = 0;
1965   if (index) {   if (index) {
1966      while (i < *index) i++;      while (i < *index) {
1967      if (indexVars[i] == -1) return NULL;   i++;
1968     if (indexVars[i] == -1) return NULL;
1969        }
1970   }   }
1971    
1972   entry = findEntryByIndex(config, indexVars[i]);   entry = findEntryByIndex(config, indexVars[i]);
# Line 2114  struct singleEntry * findTemplate(struct Line 2120  struct singleEntry * findTemplate(struct
2120   } else {   } else {
2121      entry = findEntryByTitle(cfg, defTitle, &index);      entry = findEntryByTitle(cfg, defTitle, &index);
2122   }   }
2123   if (entry)   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
2124      cfg->defaultImage = index;      cfg->defaultImage = index;
2125        if (indexPtr)
2126     *indexPtr = index;
2127        return entry;
2128     }
2129      }      }
2130   }   }
2131      } else if (cfg->defaultImage > -1) {      } else if (cfg->defaultImage > -1) {
# Line 2272  void displayEntry(struct singleEntry * e Line 2282  void displayEntry(struct singleEntry * e
2282      struct singleLine * line;      struct singleLine * line;
2283      char * root = NULL;      char * root = NULL;
2284      int i;      int i;
2285        int j;
2286    
2287      printf("index=%d\n", index);      printf("index=%d\n", index);
2288    
# Line 2359  void displayEntry(struct singleEntry * e Line 2370  void displayEntry(struct singleEntry * e
2370      } else {      } else {
2371   char * title;   char * title;
2372   line = getLineByType(LT_MENUENTRY, entry->lines);   line = getLineByType(LT_MENUENTRY, entry->lines);
2373   title = grub2ExtractTitle(line);   if (!line) {
2374   if (title)      title = grub2ExtractTitle(line);
2375      printf("title=%s\n", title);      if (title)
2376     printf("title=%s\n", title);
2377     }
2378        }
2379    
2380        for (j = 0, line = entry->lines; line; line = line->next) {
2381     if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
2382        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
2383     printf("mbmodule%d=", j);
2384        else
2385     printf("mbmodule%d=%s", j, prefix);
2386    
2387        for (i = 1; i < line->numElements; i++)
2388     printf("%s%s", line->elements[i].item, line->elements[i].indent);
2389        printf("\n");
2390        j++;
2391     }
2392      }      }
2393  }  }
2394    
# Line 3284  int updateImage(struct grubConfig * cfg, Line 3311  int updateImage(struct grubConfig * cfg,
3311  }  }
3312    
3313  int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,  int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
3314   const char * image, const char * prefix, const char * initrd) {   const char * image, const char * prefix, const char * initrd,
3315     const char * title) {
3316      struct singleEntry * entry;      struct singleEntry * entry;
3317      struct singleLine * line, * kernelLine, *endLine = NULL;      struct singleLine * line, * kernelLine, *endLine = NULL;
3318      int index = 0;      int index = 0;
3319    
3320      if (!image) return 0;      if (!image) return 0;
3321    
3322      for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
3323          kernelLine = getLineByType(LT_MBMODULE, entry->lines);          kernelLine = getLineByType(LT_MBMODULE, entry->lines);
3324          if (!kernelLine) continue;          if (!kernelLine) continue;
3325    
3326     /* if title is supplied, the entry's title must match it. */
3327     if (title) {
3328        char *linetitle;
3329    
3330        line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
3331        if (!line)
3332     continue;
3333    
3334        linetitle = extractTitle(line);
3335        if (!linetitle)
3336     continue;
3337        if (strcmp(title, linetitle)) {
3338     free(linetitle);
3339     continue;
3340        }
3341        free(linetitle);
3342     }
3343    
3344          if (prefix) {          if (prefix) {
3345              int prefixLen = strlen(prefix);              int prefixLen = strlen(prefix);
3346              if (!strncmp(initrd, prefix, prefixLen))              if (!strncmp(initrd, prefix, prefixLen))
# Line 3320  int addMBInitrd(struct grubConfig * cfg, Line 3366  int addMBInitrd(struct grubConfig * cfg,
3366  }  }
3367    
3368  int updateInitrd(struct grubConfig * cfg, const char * image,  int updateInitrd(struct grubConfig * cfg, const char * image,
3369                   const char * prefix, const char * initrd) {                   const char * prefix, const char * initrd, const char * title) {
3370      struct singleEntry * entry;      struct singleEntry * entry;
3371      struct singleLine * line, * kernelLine, *endLine = NULL;      struct singleLine * line, * kernelLine, *endLine = NULL;
3372      int index = 0;      int index = 0;
# Line 3331  int updateInitrd(struct grubConfig * cfg Line 3377  int updateInitrd(struct grubConfig * cfg
3377          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
3378          if (!kernelLine) continue;          if (!kernelLine) continue;
3379    
3380     /* if title is supplied, the entry's title must match it. */
3381     if (title) {
3382        char *linetitle;
3383    
3384        line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
3385        if (!line)
3386     continue;
3387    
3388        linetitle = extractTitle(line);
3389        if (!linetitle)
3390     continue;
3391        if (strcmp(title, linetitle)) {
3392     free(linetitle);
3393     continue;
3394        }
3395        free(linetitle);
3396     }
3397    
3398          line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);          line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
3399          if (line)          if (line)
3400              removeLine(entry, line);              removeLine(entry, line);
# Line 4034  int addNewKernel(struct grubConfig * con Line 4098  int addNewKernel(struct grubConfig * con
4098   }   }
4099      }      }
4100    
4101        struct singleLine *endLine = NULL;
4102        endLine = getLineByType(LT_ENTRY_END, new->lines);
4103        if (endLine) {
4104        removeLine(new, endLine);
4105        needs |= NEED_END;
4106        }
4107    
4108      /* add the remainder of the lines, i.e. those that either      /* add the remainder of the lines, i.e. those that either
4109       * weren't present in the template, or in the case of no template,       * weren't present in the template, or in the case of no template,
4110       * all the lines following the entryStart.       * all the lines following the entryStart.
# Line 4092  int addNewKernel(struct grubConfig * con Line 4163  int addNewKernel(struct grubConfig * con
4163   config->secondaryIndent, NULL);   config->secondaryIndent, NULL);
4164   needs &= ~NEED_END;   needs &= ~NEED_END;
4165      }      }
4166    
4167      if (needs) {      if (needs) {
4168   printf(_("grubby: needs=%d, aborting\n"), needs);   printf(_("grubby: needs=%d, aborting\n"), needs);
4169   abort();   abort();
# Line 4381  int main(int argc, const char ** argv) { Line 4453  int main(int argc, const char ** argv) {
4453      if (newKernelPath && !newKernelTitle) {      if (newKernelPath && !newKernelTitle) {
4454   fprintf(stderr, _("grubby: kernel title must be specified\n"));   fprintf(stderr, _("grubby: kernel title must be specified\n"));
4455   return 1;   return 1;
4456      } else if (!newKernelPath && (newKernelTitle  || copyDefault ||      } else if (!newKernelPath && (copyDefault ||
4457    (newKernelInitrd && !updateKernelPath)||    (newKernelInitrd && !updateKernelPath)||
4458    makeDefault || extraInitrdCount > 0)) {    makeDefault || extraInitrdCount > 0)) {
4459   fprintf(stderr, _("grubby: kernel path expected\n"));   fprintf(stderr, _("grubby: kernel path expected\n"));
# Line 4603  int main(int argc, const char ** argv) { Line 4675  int main(int argc, const char ** argv) {
4675      if (updateKernelPath && newKernelInitrd) {      if (updateKernelPath && newKernelInitrd) {
4676      if (newMBKernel) {      if (newMBKernel) {
4677      if (addMBInitrd(config, newMBKernel, updateKernelPath,      if (addMBInitrd(config, newMBKernel, updateKernelPath,
4678   bootPrefix, newKernelInitrd))   bootPrefix, newKernelInitrd,
4679     newKernelTitle))
4680      return 1;      return 1;
4681      } else {      } else {
4682      if (updateInitrd(config, updateKernelPath, bootPrefix,      if (updateInitrd(config, updateKernelPath, bootPrefix,
4683   newKernelInitrd))   newKernelInitrd, newKernelTitle))
4684   return 1;   return 1;
4685      }      }
4686      }      }

Legend:
Removed from v.2687  
changed lines
  Added in v.2962