Magellan Linux

Diff of /trunk/grubby/grubby.c

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

revision 2708 by niro, Wed Jul 16 10:56:09 2014 UTC revision 2709 by niro, Wed Jul 16 10:57:06 2014 UTC
# Line 4053  int addNewKernel(struct grubConfig * con Line 4053  int addNewKernel(struct grubConfig * con
4053   }   }
4054      }      }
4055    
4056        struct singleLine *endLine = NULL;
4057        endLine = getLineByType(LT_ENTRY_END, new->lines);
4058        if (endLine) {
4059        removeLine(new, endLine);
4060        needs |= NEED_END;
4061        }
4062    
4063      /* add the remainder of the lines, i.e. those that either      /* add the remainder of the lines, i.e. those that either
4064       * 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,
4065       * all the lines following the entryStart.       * all the lines following the entryStart.
# Line 4111  int addNewKernel(struct grubConfig * con Line 4118  int addNewKernel(struct grubConfig * con
4118   config->secondaryIndent, NULL);   config->secondaryIndent, NULL);
4119   needs &= ~NEED_END;   needs &= ~NEED_END;
4120      }      }
4121    
4122      if (needs) {      if (needs) {
4123   printf(_("grubby: needs=%d, aborting\n"), needs);   printf(_("grubby: needs=%d, aborting\n"), needs);
4124   abort();   abort();

Legend:
Removed from v.2708  
changed lines
  Added in v.2709