Magellan Linux

Diff of /trunk/grubby/grubby.c

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

revision 2685 by niro, Wed Jul 16 10:38:09 2014 UTC revision 2971 by niro, Thu Jun 30 10:06:57 2016 UTC
# Line 60  int debug = 0; /* Currently just for tem Line 60  int debug = 0; /* Currently just for tem
60    
61  int isEfi = 0;  int isEfi = 0;
62    
63    #if defined(__aarch64__)
64    #define isEfiOnly 1
65    #else
66    #define isEfiOnly 0
67    #endif
68    
69  char *saved_command_line = NULL;  char *saved_command_line = NULL;
70    
71  /* comments get lumped in with indention */  /* comments get lumped in with indention */
# Line 155  struct configFileInfo { Line 161  struct configFileInfo {
161      int defaultIsVariable;      int defaultIsVariable;
162      int defaultSupportSaved;      int defaultSupportSaved;
163      int defaultIsSaved;      int defaultIsSaved;
164        int defaultIsUnquoted;
165      enum lineType_e entryStart;      enum lineType_e entryStart;
166      enum lineType_e entryEnd;      enum lineType_e entryEnd;
167      int needsBootPrefix;      int needsBootPrefix;
# Line 575  struct keywordTypes extlinuxKeywords[] = Line 582  struct keywordTypes extlinuxKeywords[] =
582      { "initrd",    LT_INITRD,      ' ', ',' },      { "initrd",    LT_INITRD,      ' ', ',' },
583      { "append",    LT_KERNELARGS,  ' ' },      { "append",    LT_KERNELARGS,  ' ' },
584      { "prompt",     LT_UNKNOWN,     ' ' },      { "prompt",     LT_UNKNOWN,     ' ' },
585        { "fdt",        LT_DEVTREE,     ' ' },
586      { NULL,    0, 0 },      { NULL,    0, 0 },
587  };  };
588  int useextlinuxmenu;  int useextlinuxmenu;
# Line 630  struct configFileInfo extlinuxConfigType Line 638  struct configFileInfo extlinuxConfigType
638      .needsBootPrefix = 1,      .needsBootPrefix = 1,
639      .maxTitleLength = 255,      .maxTitleLength = 255,
640      .mbAllowExtraInitRds = 1,      .mbAllowExtraInitRds = 1,
641        .defaultIsUnquoted = 1,
642  };  };
643    
644  struct grubConfig {  struct grubConfig {
# Line 721  static enum lineType_e preferredLineType Line 730  static enum lineType_e preferredLineType
730      if (isEfi && cfi == &grub2ConfigType) {      if (isEfi && cfi == &grub2ConfigType) {
731   switch (type) {   switch (type) {
732   case LT_KERNEL:   case LT_KERNEL:
733      return LT_KERNEL_EFI;      return isEfiOnly ? LT_KERNEL : LT_KERNEL_EFI;
734   case LT_INITRD:   case LT_INITRD:
735      return LT_INITRD_EFI;      return isEfiOnly ? LT_INITRD : LT_INITRD_EFI;
736   default:   default:
737      return type;      return type;
738   }   }
# Line 1185  static struct grubConfig * readConfig(co Line 1194  static struct grubConfig * readConfig(co
1194   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
1195   defaultLine = line;   defaultLine = line;
1196      }      }
  } else if (line->type == LT_DEFAULT && line->numElements == 2) {  
     cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;  
     defaultLine = line;  
1197    
1198          } else if (iskernel(line->type)) {          } else if (iskernel(line->type)) {
1199      /* if by some freak chance this is multiboot and the "module"      /* if by some freak chance this is multiboot and the "module"
1200       * lines came earlier in the template, make sure to use LT_HYPER       * lines came earlier in the template, make sure to use LT_HYPER
1201       * instead of LT_KERNEL now       * instead of LT_KERNEL now
1202       */       */
1203      if (entry->multiboot)      if (entry && entry->multiboot)
1204   line->type = LT_HYPER;   line->type = LT_HYPER;
1205    
1206          } else if (line->type == LT_MBMODULE) {          } else if (line->type == LT_MBMODULE) {
# Line 1220  static struct grubConfig * readConfig(co Line 1226  static struct grubConfig * readConfig(co
1226      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);
1227      if (*end) cfg->fallbackImage = -1;      if (*end) cfg->fallbackImage = -1;
1228    
1229   } else if (line->type == LT_TITLE && line->numElements > 1) {   } else if ((line->type == LT_DEFAULT && cfi->defaultIsUnquoted) ||
1230      /* make the title a single argument (undoing our parsing) */                  (line->type == LT_TITLE && line->numElements > 1)) {
1231        /* make the title/default a single argument (undoing our parsing) */
1232      len = 0;      len = 0;
1233      for (int i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
1234   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
# Line 1328  static struct grubConfig * readConfig(co Line 1335  static struct grubConfig * readConfig(co
1335      }      }
1336   }   }
1337    
1338     if (line->type == LT_DEFAULT && line->numElements == 2) {
1339        cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
1340        defaultLine = line;
1341     }
1342    
1343   /* If we find a generic config option which should live at the   /* If we find a generic config option which should live at the
1344     top of the file, move it there. Old versions of grubby were     top of the file, move it there. Old versions of grubby were
1345     probably responsible for putting new images in the wrong     probably responsible for putting new images in the wrong
# Line 1949  struct singleEntry * findEntryByPath(str Line 1961  struct singleEntry * findEntryByPath(str
1961   }   }
1962    
1963   indexVars[i + 1] = -1;   indexVars[i + 1] = -1;
1964    
1965   i = 0;   i = 0;
1966   if (index) {   if (index) {
1967      while (i < *index) i++;      while (i < *index) {
1968      if (indexVars[i] == -1) return NULL;   i++;
1969     if (indexVars[i] == -1) return NULL;
1970        }
1971   }   }
1972    
1973   entry = findEntryByIndex(config, indexVars[i]);   entry = findEntryByIndex(config, indexVars[i]);
# Line 2107  struct singleEntry * findTemplate(struct Line 2121  struct singleEntry * findTemplate(struct
2121   } else {   } else {
2122      entry = findEntryByTitle(cfg, defTitle, &index);      entry = findEntryByTitle(cfg, defTitle, &index);
2123   }   }
2124   if (entry)   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
2125      cfg->defaultImage = index;      cfg->defaultImage = index;
2126        if (indexPtr)
2127     *indexPtr = index;
2128        return entry;
2129     }
2130      }      }
2131   }   }
2132      } else if (cfg->defaultImage > -1) {      } else if (cfg->defaultImage > -1) {
# Line 2265  void displayEntry(struct singleEntry * e Line 2283  void displayEntry(struct singleEntry * e
2283      struct singleLine * line;      struct singleLine * line;
2284      char * root = NULL;      char * root = NULL;
2285      int i;      int i;
2286        int j;
2287    
2288      printf("index=%d\n", index);      printf("index=%d\n", index);
2289    
# Line 2352  void displayEntry(struct singleEntry * e Line 2371  void displayEntry(struct singleEntry * e
2371      } else {      } else {
2372   char * title;   char * title;
2373   line = getLineByType(LT_MENUENTRY, entry->lines);   line = getLineByType(LT_MENUENTRY, entry->lines);
2374   title = grub2ExtractTitle(line);   if (line) {
2375   if (title)      title = grub2ExtractTitle(line);
2376      printf("title=%s\n", title);      if (title)
2377     printf("title=%s\n", title);
2378     }
2379        }
2380    
2381        for (j = 0, line = entry->lines; line; line = line->next) {
2382     if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
2383        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
2384     printf("mbmodule%d=", j);
2385        else
2386     printf("mbmodule%d=%s", j, prefix);
2387    
2388        for (i = 1; i < line->numElements; i++)
2389     printf("%s%s", line->elements[i].item, line->elements[i].indent);
2390        printf("\n");
2391        j++;
2392     }
2393      }      }
2394  }  }
2395    
# Line 3277  int updateImage(struct grubConfig * cfg, Line 3312  int updateImage(struct grubConfig * cfg,
3312  }  }
3313    
3314  int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,  int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
3315   const char * image, const char * prefix, const char * initrd) {   const char * image, const char * prefix, const char * initrd,
3316     const char * title) {
3317      struct singleEntry * entry;      struct singleEntry * entry;
3318      struct singleLine * line, * kernelLine, *endLine = NULL;      struct singleLine * line, * kernelLine, *endLine = NULL;
3319      int index = 0;      int index = 0;
3320    
3321      if (!image) return 0;      if (!image) return 0;
3322    
3323      for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
3324          kernelLine = getLineByType(LT_MBMODULE, entry->lines);          kernelLine = getLineByType(LT_MBMODULE, entry->lines);
3325          if (!kernelLine) continue;          if (!kernelLine) continue;
3326    
3327     /* if title is supplied, the entry's title must match it. */
3328     if (title) {
3329        char *linetitle;
3330    
3331        line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
3332        if (!line)
3333     continue;
3334    
3335        linetitle = extractTitle(line);
3336        if (!linetitle)
3337     continue;
3338        if (strcmp(title, linetitle)) {
3339     free(linetitle);
3340     continue;
3341        }
3342        free(linetitle);
3343     }
3344    
3345          if (prefix) {          if (prefix) {
3346              int prefixLen = strlen(prefix);              int prefixLen = strlen(prefix);
3347              if (!strncmp(initrd, prefix, prefixLen))              if (!strncmp(initrd, prefix, prefixLen))
# Line 3313  int addMBInitrd(struct grubConfig * cfg, Line 3367  int addMBInitrd(struct grubConfig * cfg,
3367  }  }
3368    
3369  int updateInitrd(struct grubConfig * cfg, const char * image,  int updateInitrd(struct grubConfig * cfg, const char * image,
3370                   const char * prefix, const char * initrd) {                   const char * prefix, const char * initrd, const char * title) {
3371      struct singleEntry * entry;      struct singleEntry * entry;
3372      struct singleLine * line, * kernelLine, *endLine = NULL;      struct singleLine * line, * kernelLine, *endLine = NULL;
3373      int index = 0;      int index = 0;
# Line 3324  int updateInitrd(struct grubConfig * cfg Line 3378  int updateInitrd(struct grubConfig * cfg
3378          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
3379          if (!kernelLine) continue;          if (!kernelLine) continue;
3380    
3381     /* if title is supplied, the entry's title must match it. */
3382     if (title) {
3383        char *linetitle;
3384    
3385        line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
3386        if (!line)
3387     continue;
3388    
3389        linetitle = extractTitle(line);
3390        if (!linetitle)
3391     continue;
3392        if (strcmp(title, linetitle)) {
3393     free(linetitle);
3394     continue;
3395        }
3396        free(linetitle);
3397     }
3398    
3399          line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);          line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
3400          if (line)          if (line)
3401              removeLine(entry, line);              removeLine(entry, line);
# Line 4027  int addNewKernel(struct grubConfig * con Line 4099  int addNewKernel(struct grubConfig * con
4099   }   }
4100      }      }
4101    
4102        struct singleLine *endLine = NULL;
4103        endLine = getLineByType(LT_ENTRY_END, new->lines);
4104        if (endLine) {
4105        removeLine(new, endLine);
4106        needs |= NEED_END;
4107        }
4108    
4109      /* add the remainder of the lines, i.e. those that either      /* add the remainder of the lines, i.e. those that either
4110       * 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,
4111       * all the lines following the entryStart.       * all the lines following the entryStart.
# Line 4085  int addNewKernel(struct grubConfig * con Line 4164  int addNewKernel(struct grubConfig * con
4164   config->secondaryIndent, NULL);   config->secondaryIndent, NULL);
4165   needs &= ~NEED_END;   needs &= ~NEED_END;
4166      }      }
4167    
4168      if (needs) {      if (needs) {
4169   printf(_("grubby: needs=%d, aborting\n"), needs);   printf(_("grubby: needs=%d, aborting\n"), needs);
4170   abort();   abort();
# Line 4374  int main(int argc, const char ** argv) { Line 4454  int main(int argc, const char ** argv) {
4454      if (newKernelPath && !newKernelTitle) {      if (newKernelPath && !newKernelTitle) {
4455   fprintf(stderr, _("grubby: kernel title must be specified\n"));   fprintf(stderr, _("grubby: kernel title must be specified\n"));
4456   return 1;   return 1;
4457      } else if (!newKernelPath && (newKernelTitle  || copyDefault ||      } else if (!newKernelPath && (copyDefault ||
4458    (newKernelInitrd && !updateKernelPath)||    (newKernelInitrd && !updateKernelPath)||
4459    makeDefault || extraInitrdCount > 0)) {    makeDefault || extraInitrdCount > 0)) {
4460   fprintf(stderr, _("grubby: kernel path expected\n"));   fprintf(stderr, _("grubby: kernel path expected\n"));
# Line 4596  int main(int argc, const char ** argv) { Line 4676  int main(int argc, const char ** argv) {
4676      if (updateKernelPath && newKernelInitrd) {      if (updateKernelPath && newKernelInitrd) {
4677      if (newMBKernel) {      if (newMBKernel) {
4678      if (addMBInitrd(config, newMBKernel, updateKernelPath,      if (addMBInitrd(config, newMBKernel, updateKernelPath,
4679   bootPrefix, newKernelInitrd))   bootPrefix, newKernelInitrd,
4680     newKernelTitle))
4681      return 1;      return 1;
4682      } else {      } else {
4683      if (updateInitrd(config, updateKernelPath, bootPrefix,      if (updateInitrd(config, updateKernelPath, bootPrefix,
4684   newKernelInitrd))   newKernelInitrd, newKernelTitle))
4685   return 1;   return 1;
4686      }      }
4687      }      }

Legend:
Removed from v.2685  
changed lines
  Added in v.2971