Magellan Linux

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

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

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

    revision 1721 by niro, Sat Feb 18 00:52:28 2012 UTC revision 1727 by niro, Sat Feb 18 00:57:49 2012 UTC
    # Line 874  static struct grubConfig * readConfig(co Line 874  static struct grubConfig * readConfig(co
    874      cfg->secondaryIndent = strdup(line->indent);      cfg->secondaryIndent = strdup(line->indent);
    875   }   }
    876    
    877   if (isEntryStart(line, cfi)) {   if (isEntryStart(line, cfi) || (cfg->entries && !sawEntry)) {
    878      sawEntry = 1;      sawEntry = 1;
    879      if (!entry) {      if (!entry) {
    880   cfg->entries = malloc(sizeof(*entry));   cfg->entries = malloc(sizeof(*entry));
    # Line 2961  int addNewKernel(struct grubConfig * con Line 2961  int addNewKernel(struct grubConfig * con
    2961   }   }
    2962      } else if (tmplLine->type == LT_ECHO) {      } else if (tmplLine->type == LT_ECHO) {
    2963      requote(tmplLine, config->cfi);      requote(tmplLine, config->cfi);
    2964        static const char *prefix = "'Loading ";
    2965      if (tmplLine->numElements > 1 &&      if (tmplLine->numElements > 1 &&
    2966      strstr(tmplLine->elements[1].item, "'Loading Linux ")) {      strstr(tmplLine->elements[1].item, prefix) &&
    2967   char *prefix = "'Loading ";      masterLine->next && masterLine->next->type == LT_KERNEL) {
    2968   char *newTitle = malloc(strlen(prefix) +   char *newTitle = malloc(strlen(prefix) +
    2969   strlen(newKernelTitle) + 2);   strlen(newKernelTitle) + 2);
    2970    
    Legend:
    Removed from v.1721  
    changed lines
      Added in v.1727