Magellan Linux

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

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

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

    revision 2683 by niro, Wed Jul 16 09:51:14 2014 UTC revision 2957 by niro, Wed Jun 29 14:06:18 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 92  enum lineType_e { Line 98  enum lineType_e {
    98      LT_INITRD_EFI   = 1 << 21,      LT_INITRD_EFI   = 1 << 21,
    99      LT_KERNEL_16    = 1 << 22,      LT_KERNEL_16    = 1 << 22,
    100      LT_INITRD_16    = 1 << 23,      LT_INITRD_16    = 1 << 23,
    101      LT_UNKNOWN      = 1 << 24,      LT_DEVTREE      = 1 << 24,
    102        LT_UNKNOWN      = 1 << 25,
    103  };  };
    104    
    105  struct singleLine {  struct singleLine {
    # Line 121  struct singleEntry { Line 128  struct singleEntry {
    128  #define NEED_ARGS    (1 << 3)  #define NEED_ARGS    (1 << 3)
    129  #define NEED_MB      (1 << 4)  #define NEED_MB      (1 << 4)
    130  #define NEED_END     (1 << 5)  #define NEED_END     (1 << 5)
    131    #define NEED_DEVTREE (1 << 6)
    132    
    133  #define MAIN_DEFAULT    (1 << 0)  #define MAIN_DEFAULT    (1 << 0)
    134  #define DEFAULT_SAVED       -2  #define DEFAULT_SAVED       -2
    # Line 153  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 231  struct keywordTypes grub2Keywords[] = { Line 240  struct keywordTypes grub2Keywords[] = {
    240      { "initrd16",   LT_INITRD_16,   ' ', ' ' },      { "initrd16",   LT_INITRD_16,   ' ', ' ' },
    241      { "module",     LT_MBMODULE,    ' ' },      { "module",     LT_MBMODULE,    ' ' },
    242      { "kernel",     LT_HYPER,       ' ' },      { "kernel",     LT_HYPER,       ' ' },
    243        { "devicetree", LT_DEVTREE,  ' ' },
    244      { NULL, 0, 0 },      { NULL, 0, 0 },
    245  };  };
    246    
    # Line 627  struct configFileInfo extlinuxConfigType Line 637  struct configFileInfo extlinuxConfigType
    637      .needsBootPrefix = 1,      .needsBootPrefix = 1,
    638      .maxTitleLength = 255,      .maxTitleLength = 255,
    639      .mbAllowExtraInitRds = 1,      .mbAllowExtraInitRds = 1,
    640        .defaultIsUnquoted = 1,
    641  };  };
    642    
    643  struct grubConfig {  struct grubConfig {
    # Line 718  static enum lineType_e preferredLineType Line 729  static enum lineType_e preferredLineType
    729      if (isEfi && cfi == &grub2ConfigType) {      if (isEfi && cfi == &grub2ConfigType) {
    730   switch (type) {   switch (type) {
    731   case LT_KERNEL:   case LT_KERNEL:
    732      return LT_KERNEL_EFI;      return isEfiOnly ? LT_KERNEL : LT_KERNEL_EFI;
    733   case LT_INITRD:   case LT_INITRD:
    734      return LT_INITRD_EFI;      return isEfiOnly ? LT_INITRD : LT_INITRD_EFI;
    735   default:   default:
    736      return type;      return type;
    737   }   }
    # Line 1182  static struct grubConfig * readConfig(co Line 1193  static struct grubConfig * readConfig(co
    1193   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
    1194   defaultLine = line;   defaultLine = line;
    1195      }      }
      } else if (line->type == LT_DEFAULT && line->numElements == 2) {  
         cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;  
         defaultLine = line;  
    1196    
    1197          } else if (iskernel(line->type)) {          } else if (iskernel(line->type)) {
    1198      /* if by some freak chance this is multiboot and the "module"      /* if by some freak chance this is multiboot and the "module"
    1199       * lines came earlier in the template, make sure to use LT_HYPER       * lines came earlier in the template, make sure to use LT_HYPER
    1200       * instead of LT_KERNEL now       * instead of LT_KERNEL now
    1201       */       */
    1202      if (entry->multiboot)      if (entry && entry->multiboot)
    1203   line->type = LT_HYPER;   line->type = LT_HYPER;
    1204    
    1205          } else if (line->type == LT_MBMODULE) {          } else if (line->type == LT_MBMODULE) {
    # Line 1217  static struct grubConfig * readConfig(co Line 1225  static struct grubConfig * readConfig(co
    1225      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);
    1226      if (*end) cfg->fallbackImage = -1;      if (*end) cfg->fallbackImage = -1;
    1227    
    1228   } else if (line->type == LT_TITLE && line->numElements > 1) {   } else if ((line->type == LT_DEFAULT && cfi->defaultIsUnquoted) ||
    1229      /* make the title a single argument (undoing our parsing) */                  (line->type == LT_TITLE && line->numElements > 1)) {
    1230        /* make the title/default a single argument (undoing our parsing) */
    1231      len = 0;      len = 0;
    1232      for (int i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    1233   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
    # Line 1325  static struct grubConfig * readConfig(co Line 1334  static struct grubConfig * readConfig(co
    1334      }      }
    1335   }   }
    1336    
    1337     if (line->type == LT_DEFAULT && line->numElements == 2) {
    1338        cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
    1339        defaultLine = line;
    1340     }
    1341    
    1342   /* If we find a generic config option which should live at the   /* If we find a generic config option which should live at the
    1343     top of the file, move it there. Old versions of grubby were     top of the file, move it there. Old versions of grubby were
    1344     probably responsible for putting new images in the wrong     probably responsible for putting new images in the wrong
    # Line 1946  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 2262  void displayEntry(struct singleEntry * e Line 2278  void displayEntry(struct singleEntry * e
    2278      struct singleLine * line;      struct singleLine * line;
    2279      char * root = NULL;      char * root = NULL;
    2280      int i;      int i;
    2281        int j;
    2282    
    2283      printf("index=%d\n", index);      printf("index=%d\n", index);
    2284    
    # Line 2353  void displayEntry(struct singleEntry * e Line 2370  void displayEntry(struct singleEntry * e
    2370   if (title)   if (title)
    2371      printf("title=%s\n", title);      printf("title=%s\n", title);
    2372      }      }
    2373    
    2374        for (j = 0, line = entry->lines; line; line = line->next) {
    2375     if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
    2376        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    2377     printf("mbmodule%d=", j);
    2378        else
    2379     printf("mbmodule%d=%s", j, prefix);
    2380    
    2381        for (i = 1; i < line->numElements; i++)
    2382     printf("%s%s", line->elements[i].item, line->elements[i].indent);
    2383        printf("\n");
    2384        j++;
    2385     }
    2386        }
    2387  }  }
    2388    
    2389  int isSuseSystem(void) {  int isSuseSystem(void) {
    # Line 3281  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    
    # Line 3705  int addNewKernel(struct grubConfig * con Line 3736  int addNewKernel(struct grubConfig * con
    3736   const char * newKernelPath, const char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
    3737   const char * newKernelArgs, const char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
    3738   const char ** extraInitrds, int extraInitrdCount,   const char ** extraInitrds, int extraInitrdCount,
    3739                   const char * newMBKernel, const char * newMBKernelArgs) {                   const char * newMBKernel, const char * newMBKernelArgs,
    3740     const char * newDevTreePath) {
    3741      struct singleEntry * new;      struct singleEntry * new;
    3742      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
    3743      int needs;      int needs;
    # Line 3746  int addNewKernel(struct grubConfig * con Line 3778  int addNewKernel(struct grubConfig * con
    3778          needs |= NEED_MB;          needs |= NEED_MB;
    3779          new->multiboot = 1;          new->multiboot = 1;
    3780      }      }
    3781        if (newDevTreePath && getKeywordByType(LT_DEVTREE, config->cfi))
    3782     needs |= NEED_DEVTREE;
    3783    
    3784      if (template) {      if (template) {
    3785   for (masterLine = template->lines;   for (masterLine = template->lines;
    # Line 3931  int addNewKernel(struct grubConfig * con Line 3965  int addNewKernel(struct grubConfig * con
    3965   newLine = addLineTmpl(new, tmplLine, newLine, NULL,   newLine = addLineTmpl(new, tmplLine, newLine, NULL,
    3966   config->cfi);   config->cfi);
    3967      }      }
    3968        } else if (tmplLine->type == LT_DEVTREE &&
    3969           tmplLine->numElements == 2 && newDevTreePath) {
    3970            newLine = addLineTmpl(new, tmplLine, newLine,
    3971          newDevTreePath + strlen(prefix),
    3972          config->cfi);
    3973     needs &= ~NEED_DEVTREE;
    3974        } else if (tmplLine->type == LT_ENTRY_END && needs & NEED_DEVTREE) {
    3975     const char *ndtp = newDevTreePath;
    3976     if (!strncmp(newDevTreePath, prefix, strlen(prefix)))
    3977        ndtp += strlen(prefix);
    3978     newLine = addLine(new, config->cfi, LT_DEVTREE,
    3979      config->secondaryIndent,
    3980      ndtp);
    3981     needs &= ~NEED_DEVTREE;
    3982     newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
    3983      } else {      } else {
    3984   /* pass through other lines from the template */   /* pass through other lines from the template */
    3985   newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);   newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
    # Line 4006  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 4051  int addNewKernel(struct grubConfig * con Line 4107  int addNewKernel(struct grubConfig * con
    4107   free(initrdVal);   free(initrdVal);
    4108   needs &= ~NEED_INITRD;   needs &= ~NEED_INITRD;
    4109      }      }
    4110        if (needs & NEED_DEVTREE) {
    4111     newLine = addLine(new, config->cfi, LT_DEVTREE,
    4112      config->secondaryIndent,
    4113      newDevTreePath);
    4114     needs &= ~NEED_DEVTREE;
    4115        }
    4116    
    4117        /* NEEDS_END must be last on bootloaders that need it... */
    4118      if (needs & NEED_END) {      if (needs & NEED_END) {
    4119   newLine = addLine(new, config->cfi, LT_ENTRY_END,   newLine = addLine(new, config->cfi, LT_ENTRY_END,
    4120   config->secondaryIndent, NULL);   config->secondaryIndent, NULL);
    # Line 4102  int main(int argc, const char ** argv) { Line 4166  int main(int argc, const char ** argv) {
    4166      char * newKernelArgs = NULL;      char * newKernelArgs = NULL;
    4167      char * newKernelInitrd = NULL;      char * newKernelInitrd = NULL;
    4168      char * newKernelTitle = NULL;      char * newKernelTitle = NULL;
    4169      char * newKernelVersion = NULL;      char * newDevTreePath = NULL;
    4170      char * newMBKernel = NULL;      char * newMBKernel = NULL;
    4171      char * newMBKernelArgs = NULL;      char * newMBKernelArgs = NULL;
    4172      char * removeMBKernelArgs = NULL;      char * removeMBKernelArgs = NULL;
    # Line 4160  int main(int argc, const char ** argv) { Line 4224  int main(int argc, const char ** argv) {
    4224      _("display the index of the default kernel") },      _("display the index of the default kernel") },
    4225   { "default-title", 0, 0, &displayDefaultTitle, 0,   { "default-title", 0, 0, &displayDefaultTitle, 0,
    4226      _("display the title of the default kernel") },      _("display the title of the default kernel") },
    4227     { "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0,
    4228        _("device tree file for new stanza"), _("dtb-path") },
    4229   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
    4230      _("configure elilo bootloader") },      _("configure elilo bootloader") },
    4231   { "efi", 0, POPT_ARG_NONE, &isEfi, 0,   { "efi", 0, POPT_ARG_NONE, &isEfi, 0,
    # Line 4325  int main(int argc, const char ** argv) { Line 4391  int main(int argc, const char ** argv) {
    4391      grubConfig = cfi->defaultConfig;      grubConfig = cfi->defaultConfig;
    4392      }      }
    4393    
    4394      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo ||
    4395      newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
    4396      defaultKernel || displayDefaultIndex || displayDefaultTitle ||      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
    4397      (defaultIndex >= 0))) {      (defaultIndex >= 0))) {
    # Line 4334  int main(int argc, const char ** argv) { Line 4400  int main(int argc, const char ** argv) {
    4400   return 1;   return 1;
    4401      }      }
    4402    
    4403      if ((displayDefault || kernelInfo) && (newKernelVersion || newKernelPath ||      if ((displayDefault || kernelInfo) && (newKernelPath ||
    4404     removeKernelPath)) {     removeKernelPath)) {
    4405   fprintf(stderr, _("grubby: --default-kernel and --info may not "   fprintf(stderr, _("grubby: --default-kernel and --info may not "
    4406    "be used when adding or removing kernels\n"));    "be used when adding or removing kernels\n"));
    # Line 4577  int main(int argc, const char ** argv) { Line 4643  int main(int argc, const char ** argv) {
    4643      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
    4644                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
    4645                       (const char **)extraInitrds, extraInitrdCount,                       (const char **)extraInitrds, extraInitrdCount,
    4646                       newMBKernel, newMBKernelArgs)) return 1;                       newMBKernel, newMBKernelArgs, newDevTreePath)) return 1;
    4647            
    4648    
    4649      if (numEntries(config) == 0) {      if (numEntries(config) == 0) {
    Legend:
    Removed from v.2683  
    changed lines
      Added in v.2957