Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/grubby/grubby.c

    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 2718 by niro, Wed Jul 16 11:01:36 2014 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 4053  int addNewKernel(struct grubConfig * con Line 4055  int addNewKernel(struct grubConfig * con
    4055   }   }
    4056      }      }
    4057    
    4058        struct singleLine *endLine = NULL;
    4059        endLine = getLineByType(LT_ENTRY_END, new->lines);
    4060        if (endLine) {
    4061        removeLine(new, endLine);
    4062        needs |= NEED_END;
    4063        }
    4064    
    4065      /* add the remainder of the lines, i.e. those that either      /* add the remainder of the lines, i.e. those that either
    4066       * 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,
    4067       * all the lines following the entryStart.       * all the lines following the entryStart.
    # Line 4111  int addNewKernel(struct grubConfig * con Line 4120  int addNewKernel(struct grubConfig * con
    4120   config->secondaryIndent, NULL);   config->secondaryIndent, NULL);
    4121   needs &= ~NEED_END;   needs &= ~NEED_END;
    4122      }      }
    4123    
    4124      if (needs) {      if (needs) {
    4125   printf(_("grubby: needs=%d, aborting\n"), needs);   printf(_("grubby: needs=%d, aborting\n"), needs);
    4126   abort();   abort();
    Legend:
    Removed from v.2708  
    changed lines
      Added in v.2718