Magellan Linux

Diff of /trunk/grubby/grubby.c

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

revision 2709 by niro, Wed Jul 16 10:57:06 2014 UTC revision 2957 by niro, Wed Jun 29 14:06:18 2016 UTC
# Line 1960  struct singleEntry * findEntryByPath(str Line 1960  struct singleEntry * findEntryByPath(str
1960   }   }
1961    
1962   indexVars[i + 1] = -1;   indexVars[i + 1] = -1;
1963    
1964   i = 0;   i = 0;
1965   if (index) {   if (index) {
1966      while (i < *index) i++;      while (i < *index) {
1967      if (indexVars[i] == -1) return NULL;   i++;
1968     if (indexVars[i] == -1) return NULL;
1969        }
1970   }   }
1971    
1972   entry = findEntryByIndex(config, indexVars[i]);   entry = findEntryByIndex(config, indexVars[i]);
# Line 3310  int addMBInitrd(struct grubConfig * cfg, Line 3312  int addMBInitrd(struct grubConfig * cfg,
3312    
3313      if (!image) return 0;      if (!image) return 0;
3314    
3315      for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
3316          kernelLine = getLineByType(LT_MBMODULE, entry->lines);          kernelLine = getLineByType(LT_MBMODULE, entry->lines);
3317          if (!kernelLine) continue;          if (!kernelLine) continue;
3318    

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