Magellan Linux

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

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

revision 1940 by niro, Mon Oct 1 12:39:50 2012 UTC revision 2052 by niro, Wed Feb 20 14:00:54 2013 UTC
# Line 1773  struct singleEntry * findEntryByPath(str Line 1773  struct singleEntry * findEntryByPath(str
1773    
1774      /* check all the lines matching checkType */      /* check all the lines matching checkType */
1775      for (line = entry->lines; line; line = line->next) {      for (line = entry->lines; line; line = line->next) {
1776   line = getLineByType(entry->multiboot && checkType == LT_KERNEL   enum lineType_e ct = checkType;
1777   ? LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER   if (entry->multiboot && checkType == LT_KERNEL)
1778   : checkType, line);      ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER;
1779   if (!line) break;  /* not found in this entry */   else if (checkType & LT_KERNEL)
1780        ct = checkType | LT_KERNEL_EFI;
1781     line = getLineByType(ct, line);
1782     if (!line)
1783        break;  /* not found in this entry */
1784    
1785   if (line && line->type != LT_MENUENTRY &&   if (line && line->type != LT_MENUENTRY &&
1786   line->numElements >= 2) {   line->numElements >= 2) {

Legend:
Removed from v.1940  
changed lines
  Added in v.2052