Magellan Linux

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

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

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

    revision 2960 by niro, Wed Jun 29 14:07:59 2016 UTC revision 2962 by niro, Wed Jun 29 14:40:57 2016 UTC
    # Line 2370  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) {      for (j = 0, line = entry->lines; line; line = line->next) {
    # Line 3323  int addMBInitrd(struct grubConfig * cfg, Line 3325  int addMBInitrd(struct grubConfig * cfg,
    3325    
    3326   /* if title is supplied, the entry's title must match it. */   /* if title is supplied, the entry's title must match it. */
    3327   if (title) {   if (title) {
    3328        char *linetitle;
    3329    
    3330      line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);      line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
    3331      char *linetitle = extractTitle(line);      if (!line)
    3332     continue;
    3333    
    3334        linetitle = extractTitle(line);
    3335      if (!linetitle)      if (!linetitle)
    3336   continue;   continue;
    3337      if (strcmp(title, linetitle)) {      if (strcmp(title, linetitle)) {
    # Line 3373  int updateInitrd(struct grubConfig * cfg Line 3379  int updateInitrd(struct grubConfig * cfg
    3379    
    3380   /* if title is supplied, the entry's title must match it. */   /* if title is supplied, the entry's title must match it. */
    3381   if (title) {   if (title) {
    3382        char *linetitle;
    3383    
    3384      line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);      line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
    3385      char *linetitle = extractTitle(line);      if (!line)
    3386     continue;
    3387    
    3388        linetitle = extractTitle(line);
    3389      if (!linetitle)      if (!linetitle)
    3390   continue;   continue;
    3391      if (strcmp(title, linetitle)) {      if (strcmp(title, linetitle)) {
    Legend:
    Removed from v.2960  
    changed lines
      Added in v.2962