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 2700 by niro, Wed Jul 16 10:52:01 2014 UTC revision 2959 by niro, Wed Jun 29 14:07:33 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 2118  struct singleEntry * findTemplate(struct Line 2120  struct singleEntry * findTemplate(struct
    2120   } else {   } else {
    2121      entry = findEntryByTitle(cfg, defTitle, &index);      entry = findEntryByTitle(cfg, defTitle, &index);
    2122   }   }
    2123   if (entry)   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
    2124      cfg->defaultImage = index;      cfg->defaultImage = index;
    2125        if (indexPtr)
    2126     *indexPtr = index;
    2127        return entry;
    2128     }
    2129      }      }
    2130   }   }
    2131      } else if (cfg->defaultImage > -1) {      } else if (cfg->defaultImage > -1) {
    # Line 2276  void displayEntry(struct singleEntry * e Line 2282  void displayEntry(struct singleEntry * e
    2282      struct singleLine * line;      struct singleLine * line;
    2283      char * root = NULL;      char * root = NULL;
    2284      int i;      int i;
    2285        int j;
    2286    
    2287      printf("index=%d\n", index);      printf("index=%d\n", index);
    2288    
    # Line 2367  void displayEntry(struct singleEntry * e Line 2374  void displayEntry(struct singleEntry * e
    2374   if (title)   if (title)
    2375      printf("title=%s\n", title);      printf("title=%s\n", title);
    2376      }      }
    2377    
    2378        for (j = 0, line = entry->lines; line; line = line->next) {
    2379     if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
    2380        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    2381     printf("mbmodule%d=", j);
    2382        else
    2383     printf("mbmodule%d=%s", j, prefix);
    2384    
    2385        for (i = 1; i < line->numElements; i++)
    2386     printf("%s%s", line->elements[i].item, line->elements[i].indent);
    2387        printf("\n");
    2388        j++;
    2389     }
    2390        }
    2391  }  }
    2392    
    2393  int isSuseSystem(void) {  int isSuseSystem(void) {
    # Line 3295  int addMBInitrd(struct grubConfig * cfg, Line 3316  int addMBInitrd(struct grubConfig * cfg,
    3316    
    3317      if (!image) return 0;      if (!image) return 0;
    3318    
    3319      for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
    3320          kernelLine = getLineByType(LT_MBMODULE, entry->lines);          kernelLine = getLineByType(LT_MBMODULE, entry->lines);
    3321          if (!kernelLine) continue;          if (!kernelLine) continue;
    3322    
    # Line 4038  int addNewKernel(struct grubConfig * con Line 4059  int addNewKernel(struct grubConfig * con
    4059   }   }
    4060      }      }
    4061    
    4062        struct singleLine *endLine = NULL;
    4063        endLine = getLineByType(LT_ENTRY_END, new->lines);
    4064        if (endLine) {
    4065        removeLine(new, endLine);
    4066        needs |= NEED_END;
    4067        }
    4068    
    4069      /* add the remainder of the lines, i.e. those that either      /* add the remainder of the lines, i.e. those that either
    4070       * 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,
    4071       * all the lines following the entryStart.       * all the lines following the entryStart.
    # Line 4096  int addNewKernel(struct grubConfig * con Line 4124  int addNewKernel(struct grubConfig * con
    4124   config->secondaryIndent, NULL);   config->secondaryIndent, NULL);
    4125   needs &= ~NEED_END;   needs &= ~NEED_END;
    4126      }      }
    4127    
    4128      if (needs) {      if (needs) {
    4129   printf(_("grubby: needs=%d, aborting\n"), needs);   printf(_("grubby: needs=%d, aborting\n"), needs);
    4130   abort();   abort();
    Legend:
    Removed from v.2700  
    changed lines
      Added in v.2959