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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1717 by niro,
Sat Feb 18 00:47:17 2012 UTC
+revision 1722 by niro,
Sat Feb 18 00:53:14 2012 UTC
 Line 51
  #define MAX_EXTRA_INITRDS	  16	/* code segment checked by --bootloader-probe */
  #define CODE_SEG_SIZE	  128	/* code segment checked by --bootloader-probe */
+ #define NOOP_OPCODE 0x90
+ #define JMP_SHORT_OPCODE 0xeb
  /* comments get lumped in with indention */
  struct lineElement {
      char * item;
-Line 2468 
 int checkDeviceBootloader(const char * d
+Line 2471 
 int checkDeviceBootloader(const char * d
      if (memcmp(boot, bootSect, 3))
  	return 0;
-     if (boot[1] == 0xeb) {
+     if (boot[1] == JMP_SHORT_OPCODE) {
  	offset = boot[2] + 2;
      } else if (boot[1] == 0xe8 || boot[1] == 0xe9) {
  	offset = (boot[3] << 8) + boot[2] + 2;
-     } else if (boot[0] == 0xeb) {
+     } else if (boot[0] == JMP_SHORT_OPCODE) {
- 	offset = boot[1] + 2;
+       offset = boot[1] + 2;
+         /*
+ 	 * it looks like grub, when copying stage1 into the mbr, patches stage1
+ 	 * right after the JMP location, replacing other instructions such as
+ 	 * JMPs for NOOPs. So, relax the check a little bit by skipping those
+ 	 * different bytes.
+ 	 */
+       if ((bootSect[offset + 1] == NOOP_OPCODE)
+ 	  && (bootSect[offset + 2] == NOOP_OPCODE)) {
+ 	offset = offset + 3;
+       }
      } else if (boot[0] == 0xe8 || boot[0] == 0xe9) {
  	offset = (boot[2] << 8) + boot[1] + 2;
      } else {
-Line 2948 
 int addNewKernel(struct grubConfig * con
+Line 2961 
 int addNewKernel(struct grubConfig * con
  		}
  	    } else if (tmplLine->type == LT_ECHO) {
  		    requote(tmplLine, config->cfi);
+ 		    static const char *prefix = "'Loading ";
  		    if (tmplLine->numElements > 1 &&
- 			    strstr(tmplLine->elements[1].item, "'Loading Linux ")) {
+ 			    strstr(tmplLine->elements[1].item, prefix) &&
- 			char *prefix = "'Loading ";
+ 			    masterLine->next && masterLine->next->type == LT_KERNEL) {
  			char *newTitle = malloc(strlen(prefix) +
  						strlen(newKernelTitle) + 2);
-Line 3147 
 int main(int argc, const char ** argv) {
+Line 3161 
 int main(int argc, const char ** argv) {
      struct singleEntry * template = NULL;
      int copyDefault = 0, makeDefault = 0;
      int displayDefault = 0;
+     int displayDefaultIndex = 0;
+     int displayDefaultTitle = 0;
      struct poptOption options[] = {
  	{ "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,
  	    _("add an entry for the specified kernel"), _("kernel-path") },
-Line 3179 
 int main(int argc, const char ** argv) {
+Line 3195 
 int main(int argc, const char ** argv) {
  	      "template"), NULL },
  	{ "default-kernel", 0, 0, &displayDefault, 0,
  	    _("display the path of the default kernel") },
+ 	{ "default-index", 0, 0, &displayDefaultIndex, 0,
+ 	    _("display the index of the default kernel") },
+ 	{ "default-title", 0, 0, &displayDefaultTitle, 0,
+ 	    _("display the title of the default kernel") },
  	{ "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
  	    _("configure elilo bootloader") },
  	{ "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,
-Line 3322 
 int main(int argc, const char ** argv) {
+Line 3342 
 int main(int argc, const char ** argv) {
      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||
  			  newKernelPath || removeKernelPath || makeDefault ||
- 			  defaultKernel)) {
+ 			  defaultKernel || displayDefaultIndex || displayDefaultTitle)) {
  	fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
  			  "specified option"));
  	return 1;
-Line 3373 
 int main(int argc, const char ** argv) {
+Line 3393 
 int main(int argc, const char ** argv) {
      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
  	&& !kernelInfo && !bootloaderProbe && !updateKernelPath
-         && !removeMBKernel) {
+         && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle) {
  	fprintf(stderr, _("grubby: no action specified\n"));
  	return 1;
      }
-Line 3468 
 int main(int argc, const char ** argv) {
+Line 3488 
 int main(int argc, const char ** argv) {
                 ((rootspec != NULL) ? strlen(rootspec) : 0));
  	return 0;
+     } else if (displayDefaultTitle) {
+ 	struct singleLine * line;
+ 	struct singleEntry * entry;
+ 	if (config->defaultImage == -1) return 0;
+ 	entry = findEntryByIndex(config, config->defaultImage);
+ 	if (!entry) return 0;
+ 	if (!configureGrub2) {
+ 	  line = getLineByType(LT_TITLE, entry->lines);
+ 	  if (!line) return 0;
+ 	  printf("%s\n", line->elements[1].item);
+ 	} else {
+ 	  int i;
+ 	  size_t len;
+ 	  char * start;
+ 	  char * tmp;
+ 	  dbgPrintf("This is GRUB2, default title is embeded in menuentry\n");
+ 	  line = getLineByType(LT_MENUENTRY, entry->lines);
+ 	  if (!line) return 0;
+ 	  for (i = 0; i < line->numElements; i++) {
+ 	    if (!strcmp(line->elements[i].item, "menuentry"))
+ 	      continue;
+ 	    if (*line->elements[i].item == '\'')
+ 	      start = line->elements[i].item + 1;
+ 	    else
+ 	      start = line->elements[i].item;
+ 	    len = strlen(start);
+ 	    if (*(start + len - 1) == '\'') {
+ 	      tmp = strdup(start);
+ 	      *(tmp + len - 1) = '\0';
+ 	      printf("%s", tmp);
+ 	      free(tmp);
+ 	      break;
+ 	    } else {
+ 	      printf("%s ", start);
+ 	    }
+ 	  }
+ 	  printf("\n");
+ 	}
+ 	return 0;
+     } else if (displayDefaultIndex) {
+         if (config->defaultImage == -1) return 0;
+         printf("%i\n", config->defaultImage);
      } else if (kernelInfo)
  	return displayInfo(config, kernelInfo, bootPrefix);

 Legend:



Removed from v.1717
 


changed lines


 
Added in v.1722
 Legend:



Removed from v.1717
 


changed lines


 
Added in v.1722
-Removed from v.1717
+Added in v.1722