Magellan Linux

  • Back to homepage
    • /[magellan-source]/tags/grubby-8_38/grubby.c

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

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

    revision 2688 by niro, Wed Jul 16 10:42:34 2014 UTC revision 2972 by niro, Thu Jun 30 10:17:00 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(__arch64__)  #if defined(__aarch64__)
    64  #define isEfiOnly 1  #define isEfiOnly 1
    65  #else  #else
    66  #define isEfiOnly 0  #define isEfiOnly 0
    # Line 161  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 581  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 636  struct configFileInfo extlinuxConfigType Line 639  struct configFileInfo extlinuxConfigType
    639      .needsBootPrefix = 1,      .needsBootPrefix = 1,
    640      .maxTitleLength = 255,      .maxTitleLength = 255,
    641      .mbAllowExtraInitRds = 1,      .mbAllowExtraInitRds = 1,
    642        .defaultIsUnquoted = 1,
    643  };  };
    644    
    645  struct grubConfig {  struct grubConfig {
    # Line 1191  static struct grubConfig * readConfig(co Line 1195  static struct grubConfig * readConfig(co
    1195   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
    1196   defaultLine = line;   defaultLine = line;
    1197      }      }
      } else if (line->type == LT_DEFAULT && line->numElements == 2) {  
         cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;  
         defaultLine = line;  
    1198    
    1199          } else if (iskernel(line->type)) {          } else if (iskernel(line->type)) {
    1200      /* if by some freak chance this is multiboot and the "module"      /* if by some freak chance this is multiboot and the "module"
    1201       * lines came earlier in the template, make sure to use LT_HYPER       * lines came earlier in the template, make sure to use LT_HYPER
    1202       * instead of LT_KERNEL now       * instead of LT_KERNEL now
    1203       */       */
    1204      if (entry->multiboot)      if (entry && entry->multiboot)
    1205   line->type = LT_HYPER;   line->type = LT_HYPER;
    1206    
    1207          } else if (line->type == LT_MBMODULE) {          } else if (line->type == LT_MBMODULE) {
    # Line 1226  static struct grubConfig * readConfig(co Line 1227  static struct grubConfig * readConfig(co
    1227      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);
    1228      if (*end) cfg->fallbackImage = -1;      if (*end) cfg->fallbackImage = -1;
    1229    
    1230   } else if (line->type == LT_TITLE && line->numElements > 1) {   } else if ((line->type == LT_DEFAULT && cfi->defaultIsUnquoted) ||
    1231      /* make the title a single argument (undoing our parsing) */                  (line->type == LT_TITLE && line->numElements > 1)) {
    1232        /* make the title/default a single argument (undoing our parsing) */
    1233      len = 0;      len = 0;
    1234      for (int i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    1235   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
    # Line 1334  static struct grubConfig * readConfig(co Line 1336  static struct grubConfig * readConfig(co
    1336      }      }
    1337   }   }
    1338    
    1339     if (line->type == LT_DEFAULT && line->numElements == 2) {
    1340        cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
    1341        defaultLine = line;
    1342     }
    1343    
    1344   /* If we find a generic config option which should live at the   /* If we find a generic config option which should live at the
    1345     top of the file, move it there. Old versions of grubby were     top of the file, move it there. Old versions of grubby were
    1346     probably responsible for putting new images in the wrong     probably responsible for putting new images in the wrong
    # Line 1955  struct singleEntry * findEntryByPath(str Line 1962  struct singleEntry * findEntryByPath(str
    1962   }   }
    1963    
    1964   indexVars[i + 1] = -1;   indexVars[i + 1] = -1;
    1965    
    1966   i = 0;   i = 0;
    1967   if (index) {   if (index) {
    1968      while (i < *index) i++;      while (i < *index) {
    1969      if (indexVars[i] == -1) return NULL;   i++;
    1970     if (indexVars[i] == -1) return NULL;
    1971        }
    1972   }   }
    1973    
    1974   entry = findEntryByIndex(config, indexVars[i]);   entry = findEntryByIndex(config, indexVars[i]);
    # Line 2113  struct singleEntry * findTemplate(struct Line 2122  struct singleEntry * findTemplate(struct
    2122   } else {   } else {
    2123      entry = findEntryByTitle(cfg, defTitle, &index);      entry = findEntryByTitle(cfg, defTitle, &index);
    2124   }   }
    2125   if (entry)   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
    2126      cfg->defaultImage = index;      cfg->defaultImage = index;
    2127        if (indexPtr)
    2128     *indexPtr = index;
    2129        return entry;
    2130     }
    2131      }      }
    2132   }   }
    2133      } else if (cfg->defaultImage > -1) {      } else if (cfg->defaultImage > -1) {
    # Line 2271  void displayEntry(struct singleEntry * e Line 2284  void displayEntry(struct singleEntry * e
    2284      struct singleLine * line;      struct singleLine * line;
    2285      char * root = NULL;      char * root = NULL;
    2286      int i;      int i;
    2287        int j;
    2288    
    2289      printf("index=%d\n", index);      printf("index=%d\n", index);
    2290    
    # Line 2358  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) {
    2383     if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
    2384        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    2385     printf("mbmodule%d=", j);
    2386        else
    2387     printf("mbmodule%d=%s", j, prefix);
    2388    
    2389        for (i = 1; i < line->numElements; i++)
    2390     printf("%s%s", line->elements[i].item, line->elements[i].indent);
    2391        printf("\n");
    2392        j++;
    2393     }
    2394      }      }
    2395  }  }
    2396    
    # Line 3283  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;
    3321    
    3322      if (!image) return 0;      if (!image) return 0;
    3323    
    3324      for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
    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 3319  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 3330  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 4033  int addNewKernel(struct grubConfig * con Line 4100  int addNewKernel(struct grubConfig * con
    4100   }   }
    4101      }      }
    4102    
    4103        struct singleLine *endLine = NULL;
    4104        endLine = getLineByType(LT_ENTRY_END, new->lines);
    4105        if (endLine) {
    4106        removeLine(new, endLine);
    4107        needs |= NEED_END;
    4108        }
    4109    
    4110      /* add the remainder of the lines, i.e. those that either      /* add the remainder of the lines, i.e. those that either
    4111       * 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,
    4112       * all the lines following the entryStart.       * all the lines following the entryStart.
    # Line 4091  int addNewKernel(struct grubConfig * con Line 4165  int addNewKernel(struct grubConfig * con
    4165   config->secondaryIndent, NULL);   config->secondaryIndent, NULL);
    4166   needs &= ~NEED_END;   needs &= ~NEED_END;
    4167      }      }
    4168    
    4169      if (needs) {      if (needs) {
    4170   printf(_("grubby: needs=%d, aborting\n"), needs);   printf(_("grubby: needs=%d, aborting\n"), needs);
    4171   abort();   abort();
    # Line 4196  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 4380  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 4602  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.2688  
    changed lines
      Added in v.2972