Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/grubby/grubby.c

    Diff of /trunk/grubby/grubby.c

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

    revision 2959 by niro, Wed Jun 29 14:07:33 2016 UTC revision 2972 by niro, Thu Jun 30 10:17:00 2016 UTC
    # Line 582  struct keywordTypes extlinuxKeywords[] = Line 582  struct keywordTypes extlinuxKeywords[] =
    582      { "initrd",    LT_INITRD,      ' ', ',' },      { "initrd",    LT_INITRD,      ' ', ',' },
    583      { "append",    LT_KERNELARGS,  ' ' },      { "append",    LT_KERNELARGS,  ' ' },
    584      { "prompt",     LT_UNKNOWN,     ' ' },      { "prompt",     LT_UNKNOWN,     ' ' },
    585        { "fdt",        LT_DEVTREE,     ' ' },
    586        { "fdtdir",     LT_DEVTREE,     ' ' },
    587      { NULL,    0, 0 },      { NULL,    0, 0 },
    588  };  };
    589  int useextlinuxmenu;  int useextlinuxmenu;
    # Line 2370  void displayEntry(struct singleEntry * e Line 2372  void displayEntry(struct singleEntry * e
    2372      } else {      } else {
    2373   char * title;   char * title;
    2374   line = getLineByType(LT_MENUENTRY, entry->lines);   line = getLineByType(LT_MENUENTRY, entry->lines);
    2375   title = grub2ExtractTitle(line);   if (line) {
    2376   if (title)      title = grub2ExtractTitle(line);
    2377      printf("title=%s\n", title);      if (title)
    2378     printf("title=%s\n", title);
    2379     }
    2380      }      }
    2381    
    2382      for (j = 0, line = entry->lines; line; line = line->next) {      for (j = 0, line = entry->lines; line; line = line->next) {
    # Line 3309  int updateImage(struct grubConfig * cfg, Line 3313  int updateImage(struct grubConfig * cfg,
    3313  }  }
    3314    
    3315  int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,  int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
    3316   const char * image, const char * prefix, const char * initrd) {   const char * image, const char * prefix, const char * initrd,
    3317     const char * title) {
    3318      struct singleEntry * entry;      struct singleEntry * entry;
    3319      struct singleLine * line, * kernelLine, *endLine = NULL;      struct singleLine * line, * kernelLine, *endLine = NULL;
    3320      int index = 0;      int index = 0;
    # Line 3320  int addMBInitrd(struct grubConfig * cfg, Line 3325  int addMBInitrd(struct grubConfig * cfg,
    3325          kernelLine = getLineByType(LT_MBMODULE, entry->lines);          kernelLine = getLineByType(LT_MBMODULE, entry->lines);
    3326          if (!kernelLine) continue;          if (!kernelLine) continue;
    3327    
    3328     /* if title is supplied, the entry's title must match it. */
    3329     if (title) {
    3330        char *linetitle;
    3331    
    3332        line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
    3333        if (!line)
    3334     continue;
    3335    
    3336        linetitle = extractTitle(line);
    3337        if (!linetitle)
    3338     continue;
    3339        if (strcmp(title, linetitle)) {
    3340     free(linetitle);
    3341     continue;
    3342        }
    3343        free(linetitle);
    3344     }
    3345    
    3346          if (prefix) {          if (prefix) {
    3347              int prefixLen = strlen(prefix);              int prefixLen = strlen(prefix);
    3348              if (!strncmp(initrd, prefix, prefixLen))              if (!strncmp(initrd, prefix, prefixLen))
    # Line 3345  int addMBInitrd(struct grubConfig * cfg, Line 3368  int addMBInitrd(struct grubConfig * cfg,
    3368  }  }
    3369    
    3370  int updateInitrd(struct grubConfig * cfg, const char * image,  int updateInitrd(struct grubConfig * cfg, const char * image,
    3371                   const char * prefix, const char * initrd) {                   const char * prefix, const char * initrd, const char * title) {
    3372      struct singleEntry * entry;      struct singleEntry * entry;
    3373      struct singleLine * line, * kernelLine, *endLine = NULL;      struct singleLine * line, * kernelLine, *endLine = NULL;
    3374      int index = 0;      int index = 0;
    # Line 3356  int updateInitrd(struct grubConfig * cfg Line 3379  int updateInitrd(struct grubConfig * cfg
    3379          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
    3380          if (!kernelLine) continue;          if (!kernelLine) continue;
    3381    
    3382     /* if title is supplied, the entry's title must match it. */
    3383     if (title) {
    3384        char *linetitle;
    3385    
    3386        line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
    3387        if (!line)
    3388     continue;
    3389    
    3390        linetitle = extractTitle(line);
    3391        if (!linetitle)
    3392     continue;
    3393        if (strcmp(title, linetitle)) {
    3394     free(linetitle);
    3395     continue;
    3396        }
    3397        free(linetitle);
    3398     }
    3399    
    3400          line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);          line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
    3401          if (line)          if (line)
    3402              removeLine(entry, line);              removeLine(entry, line);
    # Line 4230  int main(int argc, const char ** argv) { Line 4271  int main(int argc, const char ** argv) {
    4271      _("display the title of the default kernel") },      _("display the title of the default kernel") },
    4272   { "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0,   { "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0,
    4273      _("device tree file for new stanza"), _("dtb-path") },      _("device tree file for new stanza"), _("dtb-path") },
    4274     { "devtreedir", 0, POPT_ARG_STRING, &newDevTreePath, 0,
    4275        _("device tree directory for new stanza"), _("dtb-path") },
    4276   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
    4277      _("configure elilo bootloader") },      _("configure elilo bootloader") },
    4278   { "efi", 0, POPT_ARG_NONE, &isEfi, 0,   { "efi", 0, POPT_ARG_NONE, &isEfi, 0,
    # Line 4414  int main(int argc, const char ** argv) { Line 4457  int main(int argc, const char ** argv) {
    4457      if (newKernelPath && !newKernelTitle) {      if (newKernelPath && !newKernelTitle) {
    4458   fprintf(stderr, _("grubby: kernel title must be specified\n"));   fprintf(stderr, _("grubby: kernel title must be specified\n"));
    4459   return 1;   return 1;
    4460      } else if (!newKernelPath && (newKernelTitle  || copyDefault ||      } else if (!newKernelPath && (copyDefault ||
    4461    (newKernelInitrd && !updateKernelPath)||    (newKernelInitrd && !updateKernelPath)||
    4462    makeDefault || extraInitrdCount > 0)) {    makeDefault || extraInitrdCount > 0)) {
    4463   fprintf(stderr, _("grubby: kernel path expected\n"));   fprintf(stderr, _("grubby: kernel path expected\n"));
    # Line 4636  int main(int argc, const char ** argv) { Line 4679  int main(int argc, const char ** argv) {
    4679      if (updateKernelPath && newKernelInitrd) {      if (updateKernelPath && newKernelInitrd) {
    4680      if (newMBKernel) {      if (newMBKernel) {
    4681      if (addMBInitrd(config, newMBKernel, updateKernelPath,      if (addMBInitrd(config, newMBKernel, updateKernelPath,
    4682   bootPrefix, newKernelInitrd))   bootPrefix, newKernelInitrd,
    4683     newKernelTitle))
    4684      return 1;      return 1;
    4685      } else {      } else {
    4686      if (updateInitrd(config, updateKernelPath, bootPrefix,      if (updateInitrd(config, updateKernelPath, bootPrefix,
    4687   newKernelInitrd))   newKernelInitrd, newKernelTitle))
    4688   return 1;   return 1;
    4689      }      }
    4690      }      }
    Legend:
    Removed from v.2959  
    changed lines
      Added in v.2972