Magellan Linux

  • Back to homepage
    • /[magellan-source]/tags/grubby-8_40_20170706/grubby.c

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

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

    revision 2980 by niro, Thu Jun 30 10:26:25 2016 UTC revision 2986 by niro, Thu Jun 30 10:30:31 2016 UTC
    # Line 837  static int isEntryStart(struct singleLin Line 837  static int isEntryStart(struct singleLin
    837  static char * extractTitle(struct grubConfig *cfg, struct singleLine * line) {  static char * extractTitle(struct grubConfig *cfg, struct singleLine * line) {
    838      /* bracketed title... let's extract it */      /* bracketed title... let's extract it */
    839      char * title = NULL;      char * title = NULL;
         if (cfg->cfi == &grub2ConfigType)  
      return grub2ExtractTitle(line);  
    840      if (line->type == LT_TITLE) {      if (line->type == LT_TITLE) {
    841   char *tmp = line->elements[cfg->cfi->titlePosition].item;   char *tmp = line->elements[cfg->cfi->titlePosition].item;
    842   if (cfg->cfi->titleBracketed) {   if (cfg->cfi->titleBracketed) {
    # Line 4426  int main(int argc, const char ** argv) { Line 4424  int main(int argc, const char ** argv) {
    4424      }      }
    4425    
    4426      if (!cfi) {      if (!cfi) {
    4427          if (grub2FindConfig(&grub2ConfigType))          if (grub2FindConfig(&grub2ConfigType)) {
    4428      cfi = &grub2ConfigType;      cfi = &grub2ConfigType;
    4429   else      if (envPath)
    4430     cfi->envFile = envPath;
    4431            } else
    4432        #ifdef __ia64__        #ifdef __ia64__
    4433      cfi = &eliloConfigType;      cfi = &eliloConfigType;
    4434        #elif __powerpc__        #elif __powerpc__
    Legend:
    Removed from v.2980  
    changed lines
      Added in v.2986