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 2708 by niro, Wed Jul 16 10:56:09 2014 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 2262  void displayEntry(struct singleEntry * e Line 2276  void displayEntry(struct singleEntry * e
    2276      struct singleLine * line;      struct singleLine * line;
    2277      char * root = NULL;      char * root = NULL;
    2278      int i;      int i;
    2279        int j;
    2280    
    2281      printf("index=%d\n", index);      printf("index=%d\n", index);
    2282    
    # Line 2353  void displayEntry(struct singleEntry * e Line 2368  void displayEntry(struct singleEntry * e
    2368   if (title)   if (title)
    2369      printf("title=%s\n", title);      printf("title=%s\n", title);
    2370      }      }
    2371    
    2372        for (j = 0, line = entry->lines; line; line = line->next) {
    2373     if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
    2374        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    2375     printf("mbmodule%d=", j);
    2376        else
    2377     printf("mbmodule%d=%s", j, prefix);
    2378    
    2379        for (i = 1; i < line->numElements; i++)
    2380     printf("%s%s", line->elements[i].item, line->elements[i].indent);
    2381        printf("\n");
    2382        j++;
    2383     }
    2384        }
    2385  }  }
    2386    
    2387  int isSuseSystem(void) {  int isSuseSystem(void) {
    # Line 3705  int addNewKernel(struct grubConfig * con Line 3734  int addNewKernel(struct grubConfig * con
    3734   const char * newKernelPath, const char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
    3735   const char * newKernelArgs, const char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
    3736   const char ** extraInitrds, int extraInitrdCount,   const char ** extraInitrds, int extraInitrdCount,
    3737                   const char * newMBKernel, const char * newMBKernelArgs) {                   const char * newMBKernel, const char * newMBKernelArgs,
    3738     const char * newDevTreePath) {
    3739      struct singleEntry * new;      struct singleEntry * new;
    3740      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
    3741      int needs;      int needs;
    # Line 3746  int addNewKernel(struct grubConfig * con Line 3776  int addNewKernel(struct grubConfig * con
    3776          needs |= NEED_MB;          needs |= NEED_MB;
    3777          new->multiboot = 1;          new->multiboot = 1;
    3778      }      }
    3779        if (newDevTreePath && getKeywordByType(LT_DEVTREE, config->cfi))
    3780     needs |= NEED_DEVTREE;
    3781    
    3782      if (template) {      if (template) {
    3783   for (masterLine = template->lines;   for (masterLine = template->lines;
    # Line 3931  int addNewKernel(struct grubConfig * con Line 3963  int addNewKernel(struct grubConfig * con
    3963   newLine = addLineTmpl(new, tmplLine, newLine, NULL,   newLine = addLineTmpl(new, tmplLine, newLine, NULL,
    3964   config->cfi);   config->cfi);
    3965      }      }
    3966        } else if (tmplLine->type == LT_DEVTREE &&
    3967           tmplLine->numElements == 2 && newDevTreePath) {
    3968            newLine = addLineTmpl(new, tmplLine, newLine,
    3969          newDevTreePath + strlen(prefix),
    3970          config->cfi);
    3971     needs &= ~NEED_DEVTREE;
    3972        } else if (tmplLine->type == LT_ENTRY_END && needs & NEED_DEVTREE) {
    3973     const char *ndtp = newDevTreePath;
    3974     if (!strncmp(newDevTreePath, prefix, strlen(prefix)))
    3975        ndtp += strlen(prefix);
    3976     newLine = addLine(new, config->cfi, LT_DEVTREE,
    3977      config->secondaryIndent,
    3978      ndtp);
    3979     needs &= ~NEED_DEVTREE;
    3980     newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
    3981      } else {      } else {
    3982   /* pass through other lines from the template */   /* pass through other lines from the template */
    3983   newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);   newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
    # Line 4051  int addNewKernel(struct grubConfig * con Line 4098  int addNewKernel(struct grubConfig * con
    4098   free(initrdVal);   free(initrdVal);
    4099   needs &= ~NEED_INITRD;   needs &= ~NEED_INITRD;
    4100      }      }
    4101        if (needs & NEED_DEVTREE) {
    4102     newLine = addLine(new, config->cfi, LT_DEVTREE,
    4103      config->secondaryIndent,
    4104      newDevTreePath);
    4105     needs &= ~NEED_DEVTREE;
    4106        }
    4107    
    4108        /* NEEDS_END must be last on bootloaders that need it... */
    4109      if (needs & NEED_END) {      if (needs & NEED_END) {
    4110   newLine = addLine(new, config->cfi, LT_ENTRY_END,   newLine = addLine(new, config->cfi, LT_ENTRY_END,
    4111   config->secondaryIndent, NULL);   config->secondaryIndent, NULL);
    4112   needs &= ~NEED_END;   needs &= ~NEED_END;
    4113      }      }
       
    4114      if (needs) {      if (needs) {
    4115   printf(_("grubby: needs=%d, aborting\n"), needs);   printf(_("grubby: needs=%d, aborting\n"), needs);
    4116   abort();   abort();
    # Line 4102  int main(int argc, const char ** argv) { Line 4156  int main(int argc, const char ** argv) {
    4156      char * newKernelArgs = NULL;      char * newKernelArgs = NULL;
    4157      char * newKernelInitrd = NULL;      char * newKernelInitrd = NULL;
    4158      char * newKernelTitle = NULL;      char * newKernelTitle = NULL;
    4159      char * newKernelVersion = NULL;      char * newDevTreePath = NULL;
    4160      char * newMBKernel = NULL;      char * newMBKernel = NULL;
    4161      char * newMBKernelArgs = NULL;      char * newMBKernelArgs = NULL;
    4162      char * removeMBKernelArgs = NULL;      char * removeMBKernelArgs = NULL;
    # Line 4160  int main(int argc, const char ** argv) { Line 4214  int main(int argc, const char ** argv) {
    4214      _("display the index of the default kernel") },      _("display the index of the default kernel") },
    4215   { "default-title", 0, 0, &displayDefaultTitle, 0,   { "default-title", 0, 0, &displayDefaultTitle, 0,
    4216      _("display the title of the default kernel") },      _("display the title of the default kernel") },
    4217     { "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0,
    4218        _("device tree file for new stanza"), _("dtb-path") },
    4219   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
    4220      _("configure elilo bootloader") },      _("configure elilo bootloader") },
    4221   { "efi", 0, POPT_ARG_NONE, &isEfi, 0,   { "efi", 0, POPT_ARG_NONE, &isEfi, 0,
    # Line 4325  int main(int argc, const char ** argv) { Line 4381  int main(int argc, const char ** argv) {
    4381      grubConfig = cfi->defaultConfig;      grubConfig = cfi->defaultConfig;
    4382      }      }
    4383    
    4384      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo ||
    4385      newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
    4386      defaultKernel || displayDefaultIndex || displayDefaultTitle ||      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
    4387      (defaultIndex >= 0))) {      (defaultIndex >= 0))) {
    # Line 4334  int main(int argc, const char ** argv) { Line 4390  int main(int argc, const char ** argv) {
    4390   return 1;   return 1;
    4391      }      }
    4392    
    4393      if ((displayDefault || kernelInfo) && (newKernelVersion || newKernelPath ||      if ((displayDefault || kernelInfo) && (newKernelPath ||
    4394     removeKernelPath)) {     removeKernelPath)) {
    4395   fprintf(stderr, _("grubby: --default-kernel and --info may not "   fprintf(stderr, _("grubby: --default-kernel and --info may not "
    4396    "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 4633  int main(int argc, const char ** argv) {
    4633      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
    4634                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
    4635                       (const char **)extraInitrds, extraInitrdCount,                       (const char **)extraInitrds, extraInitrdCount,
    4636                       newMBKernel, newMBKernelArgs)) return 1;                       newMBKernel, newMBKernelArgs, newDevTreePath)) return 1;
    4637            
    4638    
    4639      if (numEntries(config) == 0) {      if (numEntries(config) == 0) {
    Legend:
    Removed from v.2683  
    changed lines
      Added in v.2708