/[magellan-source]/tags/grubby-8_32/grubby.c

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

Parent Directory | Revision Log | View Patch Patch

-revision 1934 by niro,
Mon Oct  1 12:08:46 2012 UTC
+revision 1940 by niro,
Mon Oct  1 12:39:50 2012 UTC
 Line 56 
 int debug = 0;	/* Currently just for tem
  #define NOOP_OPCODE 0x90
  #define JMP_SHORT_OPCODE 0xeb
+ int isEfi = 0;
  /* comments get lumped in with indention */
  struct lineElement {
      char * item;
-Line 82 
 enum lineType_e {
+Line 84 
 enum lineType_e {
      LT_MENUENTRY    = 1 << 17,
      LT_ENTRY_END    = 1 << 18,
      LT_SET_VARIABLE = 1 << 19,
-     LT_UNKNOWN      = 1 << 20,
+     LT_KERNEL_EFI   = 1 << 20,
+     LT_INITRD_EFI   = 1 << 21,
+     LT_UNKNOWN      = 1 << 22,
  };
  struct singleLine {
-Line 205 
 struct keywordTypes grub2Keywords[] = {
+Line 209 
 struct keywordTypes grub2Keywords[] = {
      { "default",    LT_DEFAULT,     ' ' },
      { "fallback",   LT_FALLBACK,    ' ' },
      { "linux",      LT_KERNEL,      ' ' },
-     { "linuxefi",   LT_KERNEL,      ' ' },
+     { "linuxefi",   LT_KERNEL_EFI,  ' ' },
      { "initrd",     LT_INITRD,      ' ', ' ' },
-     { "initrdefi",  LT_INITRD,      ' ', ' ' },
+     { "initrdefi",  LT_INITRD_EFI,  ' ', ' ' },
      { "module",     LT_MBMODULE,    ' ' },
      { "kernel",     LT_HYPER,       ' ' },
      { NULL, 0, 0 },
-Line 273 
 static int isquote(char q)
+Line 277 
 static int isquote(char q)
      return 0;
  }
+ static int iskernel(enum lineType_e type) {
+     return (type == LT_KERNEL || type == LT_KERNEL_EFI);
+ }
+ static int isinitrd(enum lineType_e type) {
+     return (type == LT_INITRD || type == LT_INITRD_EFI);
+ }
  char *grub2ExtractTitle(struct singleLine * line) {
      char * current;
      char * current_indent;
-Line 572 
 static char * sdupprintf(const char *for
+Line 584 
 static char * sdupprintf(const char *for
      return buf;
  }
+ static enum lineType_e preferredLineType(enum lineType_e type,
+ 					 struct configFileInfo *cfi) {
+     if (isEfi && cfi == &grub2ConfigType) {
+ 	switch (type) {
+ 	case LT_KERNEL:
+ 	    return LT_KERNEL_EFI;
+ 	case LT_INITRD:
+ 	    return LT_INITRD_EFI;
+ 	default:
+ 	    return type;
+ 	}
+     }
+     return type;
+ }
  static struct keywordTypes * getKeywordByType(enum lineType_e type,
  					      struct configFileInfo * cfi) {
      for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
-Line 996 
 static struct grubConfig * readConfig(co
+Line 1023 
 static struct grubConfig * readConfig(co
  	    cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
  	    defaultLine = line;
-         } else if (line->type == LT_KERNEL) {
+         } else if (iskernel(line->type)) {
  	    /* if by some freak chance this is multiboot and the "module"
  	     * lines came earlier in the template, make sure to use LT_HYPER
  	     * instead of LT_KERNEL now
-Line 1013 
 static struct grubConfig * readConfig(co
+Line 1040 
 static struct grubConfig * readConfig(co
  	    for (struct singleLine *l = entry->lines; l; l = l->next) {
  		if (l->type == LT_HYPER)
  		    break;
- 		else if (l->type == LT_KERNEL) {
+ 		else if (iskernel(l->type)) {
  		    l->type = LT_HYPER;
  		    break;
  		}
-Line 1567 
 int suitableImage(struct singleEntry * e
+Line 1594 
 int suitableImage(struct singleEntry * e
  	return 0;
      }
-     line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);
+     line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
      if (!line) {
  	notSuitablePrintf(entry, "no line found\n");
  	return 0;
-Line 1697 
 struct singleEntry * findEntryByPath(str
+Line 1724 
 struct singleEntry * findEntryByPath(str
  	entry = findEntryByIndex(config, indexVars[i]);
  	if (!entry) return NULL;
- 	line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);
+ 	line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
  	if (!line) return NULL;
  	if (index) *index = indexVars[i];
-Line 1746 
 struct singleEntry * findEntryByPath(str
+Line 1773 
 struct singleEntry * findEntryByPath(str
  	    /* check all the lines matching checkType */
  	    for (line = entry->lines; line; line = line->next) {
- 		line = getLineByType(entry->multiboot && checkType == LT_KERNEL ?
+ 		line = getLineByType(entry->multiboot && checkType == LT_KERNEL
- 				     LT_KERNEL|LT_MBMODULE|LT_HYPER :
+ 				? LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER
- 				     checkType, line);
+ 				: checkType, line);
  		if (!line) break;  /* not found in this entry */
  		if (line && line->type != LT_MENUENTRY &&
-Line 1768 
 struct singleEntry * findEntryByPath(str
+Line 1795 
 struct singleEntry * findEntryByPath(str
  	     * non-Linux boot entries (could find netbsd etc, though, which is
  	     * unfortunate)
  	     */
- 	    if (line && getLineByType(LT_KERNEL|LT_HYPER, entry->lines))
+ 	    if (line && getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines))
  		break; /* found 'im! */
  	}
-Line 1957 
 void displayEntry(struct singleEntry * e
+Line 1984 
 void displayEntry(struct singleEntry * e
      printf("index=%d\n", index);
-     line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);
+     line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
      if (!line) {
          printf("non linux entry\n");
          return;
-Line 2022 
 void displayEntry(struct singleEntry * e
+Line 2049 
 void displayEntry(struct singleEntry * e
  	printf("root=%s\n", s);
      }
-     line = getLineByType(LT_INITRD, entry->lines);
+     line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);
      if (line && line->numElements >= 2) {
  	if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
-Line 2423 
 struct singleLine * addLineTmpl(struct s
+Line 2450 
 struct singleLine * addLineTmpl(struct s
  {
      struct singleLine * newLine = lineDup(tmplLine);
+     if (isEfi && cfi == &grub2ConfigType) {
+ 	enum lineType_e old = newLine->type;
+ 	newLine->type = preferredLineType(newLine->type, cfi);
+ 	if (old != newLine->type)
+ 	    newLine->elements[0].item = getKeyByType(newLine->type, cfi);
+     }
      if (val) {
  	/* override the inherited value with our own.
  	 * This is a little weak because it only applies to elements[1]
-Line 2432 
 struct singleLine * addLineTmpl(struct s
+Line 2466 
 struct singleLine * addLineTmpl(struct s
  	insertElement(newLine, val, 1, cfi);
  	/* but try to keep the rootspec from the template... sigh */
- 	if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD)) {
+ 	if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD|LT_KERNEL_EFI|LT_INITRD_EFI)) {
  	    char * rootspec = getRootSpecifier(tmplLine->elements[1].item);
  	    if (rootspec != NULL) {
  		free(newLine->elements[1].item);
-Line 2469 
 struct singleLine *  addLine(struct sing
+Line 2503 
 struct singleLine *  addLine(struct sing
      /* NB: This function shouldn't allocate items on the heap, rather on the
       * stack since it calls addLineTmpl which will make copies.
       */
      if (type == LT_TITLE && cfi->titleBracketed) {
  	/* we're doing a bracketed title (zipl) */
  	tmpl.type = type;
-Line 2803 
 int updateActualImage(struct grubConfig
+Line 2836 
 int updateActualImage(struct grubConfig
  	    firstElement = 2;
  	} else {
- 	    line = getLineByType(LT_KERNEL|LT_MBMODULE, entry->lines);
+ 	    line = getLineByType(LT_KERNEL|LT_MBMODULE|LT_KERNEL_EFI, entry->lines);
  	    if (!line) {
  		/* no LT_KERNEL or LT_MBMODULE in this entry? */
  		continue;
-Line 2968 
 int updateInitrd(struct grubConfig * cfg
+Line 3001 
 int updateInitrd(struct grubConfig * cfg
      if (!image) return 0;
      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
-         kernelLine = getLineByType(LT_KERNEL, entry->lines);
+         kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI, entry->lines);
          if (!kernelLine) continue;
-         line = getLineByType(LT_INITRD, entry->lines);
+         line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);
          if (line)
              removeLine(entry, line);
          if (prefix) {
-Line 2982 
 int updateInitrd(struct grubConfig * cfg
+Line 3015 
 int updateInitrd(struct grubConfig * cfg
  	endLine = getLineByType(LT_ENTRY_END, entry->lines);
  	if (endLine)
  	    removeLine(entry, endLine);
-         line = addLine(entry, cfg->cfi, LT_INITRD, kernelLine->indent, initrd);
+         line = addLine(entry, cfg->cfi, preferredLineType(LT_INITRD, cfg->cfi),
+ 			kernelLine->indent, initrd);
          if (!line)
  	    return 1;
  	if (endLine) {
-Line 3395 
 int addNewKernel(struct grubConfig * con
+Line 3429 
 int addNewKernel(struct grubConfig * con
  	    while (*chptr && isspace(*chptr)) chptr++;
  	    if (*chptr == '#') continue;
- 	    if (tmplLine->type == LT_KERNEL &&
+ 	    if (iskernel(tmplLine->type) && tmplLine->numElements >= 2) {
- 		    tmplLine->numElements >= 2) {
  		if (!template->multiboot && (needs & NEED_MB)) {
  		    /* it's not a multiboot template and this is the kernel
  		     * line.  Try to be intelligent about inserting the
-Line 3473 
 int addNewKernel(struct grubConfig * con
+Line 3506 
 int addNewKernel(struct grubConfig * con
  		    /* template is multi but new is not,
  		     * insert the kernel in the first module slot
  		     */
- 		    tmplLine->type = LT_KERNEL;
+ 		    tmplLine->type = preferredLineType(LT_KERNEL, config->cfi);
  		    free(tmplLine->elements[0].item);
  		    tmplLine->elements[0].item =
- 			strdup(getKeywordByType(LT_KERNEL, config->cfi)->key);
+ 			strdup(getKeywordByType(tmplLine->type,
+ 						config->cfi)->key);
  		    newLine = addLineTmpl(new, tmplLine, newLine,
- 					  newKernelPath + strlen(prefix), config->cfi);
+ 					  newKernelPath + strlen(prefix),
+ 					  config->cfi);
  		    needs &= ~NEED_KERNEL;
  		} else if (needs & NEED_INITRD) {
  		    char *initrdVal;
  		    /* template is multi but new is not,
  		     * insert the initrd in the second module slot
  		     */
- 		    tmplLine->type = LT_INITRD;
+ 		    tmplLine->type = preferredLineType(LT_INITRD, config->cfi);
  		    free(tmplLine->elements[0].item);
  		    tmplLine->elements[0].item =
- 			strdup(getKeywordByType(LT_INITRD, config->cfi)->key);
+ 			strdup(getKeywordByType(tmplLine->type,
+ 						config->cfi)->key);
  		    initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);
  		    newLine = addLineTmpl(new, tmplLine, newLine, initrdVal, config->cfi);
  		    free(initrdVal);
  		    needs &= ~NEED_INITRD;
  		}
- 	    } else if (tmplLine->type == LT_INITRD &&
+ 	    } else if (isinitrd(tmplLine->type) && tmplLine->numElements >= 2) {
- 		       tmplLine->numElements >= 2) {
  		if (needs & NEED_INITRD &&
  		    new->multiboot && !template->multiboot &&
  		    config->cfi->mbInitRdIsModule) {
-Line 3550 
 int addNewKernel(struct grubConfig * con
+Line 3585 
 int addNewKernel(struct grubConfig * con
  		    static const char *prefix = "'Loading ";
  		    if (tmplLine->numElements > 1 &&
  			    strstr(tmplLine->elements[1].item, prefix) &&
- 			    masterLine->next && masterLine->next->type == LT_KERNEL) {
+ 			    masterLine->next &&
+ 			    iskernel(masterLine->next->type)) {
  			char *newTitle = malloc(strlen(prefix) +
  						strlen(newKernelTitle) + 2);
-Line 3577 
 int addNewKernel(struct grubConfig * con
+Line 3613 
 int addNewKernel(struct grubConfig * con
  	 */
  	switch (config->cfi->entryStart) {
  	    case LT_KERNEL:
+ 	    case LT_KERNEL_EFI:
  		if (new->multiboot && config->cfi->mbHyperFirst) {
  		    /* fall through to LT_HYPER */
  		} else {
- 		    newLine = addLine(new, config->cfi, LT_KERNEL,
+ 		    newLine = addLine(new, config->cfi,
+ 		    		      preferredLineType(LT_KERNEL, config->cfi),
  				      config->primaryIndent,
  				      newKernelPath + strlen(prefix));
  		    needs &= ~NEED_KERNEL;
-Line 3656 
 int addNewKernel(struct grubConfig * con
+Line 3694 
 int addNewKernel(struct grubConfig * con
      if (needs & NEED_KERNEL) {
  	newLine = addLine(new, config->cfi,
  			  (new->multiboot && getKeywordByType(LT_MBMODULE,
- 							      config->cfi)) ?
+ 							      config->cfi))
- 			  LT_MBMODULE : LT_KERNEL,
+ 			  	? LT_MBMODULE
+ 				: preferredLineType(LT_KERNEL, config->cfi),
  			  config->secondaryIndent,
  			  newKernelPath + strlen(prefix));
  	needs &= ~NEED_KERNEL;
-Line 3673 
 int addNewKernel(struct grubConfig * con
+Line 3712 
 int addNewKernel(struct grubConfig * con
  	initrdVal = getInitrdVal(config, prefix, NULL, newKernelInitrd, extraInitrds, extraInitrdCount);
  	newLine = addLine(new, config->cfi,
  			  (new->multiboot && getKeywordByType(LT_MBMODULE,
- 							      config->cfi)) ?
+ 							      config->cfi))
- 			  LT_MBMODULE : LT_INITRD,
+ 			   ? LT_MBMODULE
+ 			   : preferredLineType(LT_INITRD, config->cfi),
  			  config->secondaryIndent,
  			  initrdVal);
  	free(initrdVal);
-Line 3790 
 int main(int argc, const char ** argv) {
+Line 3830 
 int main(int argc, const char ** argv) {
  	    _("display the title of the default kernel") },
  	{ "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
  	    _("configure elilo bootloader") },
+ 	{ "efi", 0, POPT_ARG_NONE, &isEfi, 0,
+ 	    _("force grub2 stanzas to use efi") },
  	{ "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,
  	    _("configure extlinux bootloader (from syslinux)") },
  	{ "grub", 0, POPT_ARG_NONE, &configureGrub, 0,
-Line 4102 
 int main(int argc, const char ** argv) {
+Line 4144 
 int main(int argc, const char ** argv) {
  	if (!entry) return 0;
  	if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
- 	line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);
+ 	line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
  	if (!line) return 0;
          rootspec = getRootSpecifier(line->elements[1].item);

 Legend:



Removed from v.1934
 


changed lines


 
Added in v.1940
 Legend:



Removed from v.1934
 


changed lines


 
Added in v.1940
-Removed from v.1934
+Added in v.1940