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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1715 by niro,
Sat Feb 18 00:35:46 2012 UTC
+revision 1745 by niro,
Sat Feb 18 01:05:52 2012 UTC
 Line 46
  #define dbgPrintf(format, args...)
  #endif
+ int debug = 0;	/* Currently just for template debugging */
  #define _(A) (A)
  #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 871 
 static struct grubConfig * readConfig(co
+Line 876 
 static struct grubConfig * readConfig(co
  	    cfg->secondaryIndent = strdup(line->indent);
  	}
- 	if (isEntryStart(line, cfi)) {
+ 	if (isEntryStart(line, cfi) || (cfg->entries && !sawEntry)) {
  	    sawEntry = 1;
  	    if (!entry) {
  		cfg->entries = malloc(sizeof(*entry));
-Line 1335 
 static char *findDiskForRoot()
+Line 1340 
 static char *findDiskForRoot()
      return NULL;
  }
+ void printEntry(struct singleEntry * entry) {
+     int i;
+     struct singleLine * line;
+     for (line = entry->lines; line; line = line->next) {
+ 	fprintf(stderr, "DBG: %s", line->indent);
+ 	for (i = 0; i < line->numElements; i++) {
+ 		fprintf(stderr, "%s%s",
+ 		    line->elements[i].item, line->elements[i].indent);
+ 	}
+ 	fprintf(stderr, "\n");
+     }
+ }
+ void notSuitablePrintf(struct singleEntry * entry, const char *fmt, ...)
+ {
+     va_list argp;
+     if (!debug)
+ 	return;
+     va_start(argp, fmt);
+     fprintf(stderr, "DBG: Image entry failed: ");
+     vfprintf(stderr, fmt, argp);
+     printEntry(entry);
+     va_end(argp);
+ }
+ #define beginswith(s, c) ((s) && (s)[0] == (c))
+ static int endswith(const char *s, char c)
+ {
+ 	int slen;
+ 	if (!s && !s[0])
+ 		return 0;
+ 	slen = strlen(s) - 1;
+ 	return s[slen] == c;
+ }
  int suitableImage(struct singleEntry * entry, const char * bootPrefix,
  		  int skipRemoved, int flags) {
      struct singleLine * line;
-Line 1344 
 int suitableImage(struct singleEntry * e
+Line 1390 
 int suitableImage(struct singleEntry * e
      char * rootspec;
      char * rootdev;
-     if (skipRemoved && entry->skip) return 0;
+     if (skipRemoved && entry->skip) {
+ 	notSuitablePrintf(entry, "marked to skip\n");
+ 	return 0;
+     }
      line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);
-     if (!line || line->numElements < 2) return 0;
+     if (!line) {
+ 	notSuitablePrintf(entry, "no line found\n");
+ 	return 0;
+     }
+     if (line->numElements < 2) {
+ 	notSuitablePrintf(entry, "line has only %d elements\n",
+ 	    line->numElements);
+ 	return 0;
+     }
      if (flags & GRUBBY_BADIMAGE_OKAY) return 1;
      fullName = alloca(strlen(bootPrefix) +
  		      strlen(line->elements[1].item) + 1);
      rootspec = getRootSpecifier(line->elements[1].item);
-     sprintf(fullName, "%s%s", bootPrefix,
+     int rootspec_offset = rootspec ? strlen(rootspec) : 0;
-             line->elements[1].item + (rootspec ? strlen(rootspec) : 0));
+     int hasslash = endswith(bootPrefix, '/') ||
-     if (access(fullName, R_OK)) return 0;
+     	beginswith(line->elements[1].item + rootspec_offset, '/');
+     sprintf(fullName, "%s%s%s", bootPrefix, hasslash ? "" : "/",
+             line->elements[1].item + rootspec_offset);
+     if (access(fullName, R_OK)) {
+ 	notSuitablePrintf(entry, "access to %s failed\n", fullName);
+ 	return 0;
+     }
      for (i = 2; i < line->numElements; i++)
  	if (!strncasecmp(line->elements[i].item, "root=", 5)) break;
      if (i < line->numElements) {
-Line 1375 
 int suitableImage(struct singleEntry * e
+Line 1437 
 int suitableImage(struct singleEntry * e
  	    line = getLineByType(LT_KERNELARGS|LT_MBMODULE, entry->lines);
              /* failed to find one */
-             if (!line) return 0;
+             if (!line) {
+ 		notSuitablePrintf(entry, "no line found\n");
+ 		return 0;
+             }
  	    for (i = 1; i < line->numElements; i++)
  	        if (!strncasecmp(line->elements[i].item, "root=", 5)) break;
  	    if (i < line->numElements)
  	        dev = line->elements[i].item + 5;
  	    else {
+ 		notSuitablePrintf(entry, "no root= entry found\n");
  		/* it failed too...  can't find root= */
  	        return 0;
              }
-Line 1389 
 int suitableImage(struct singleEntry * e
+Line 1455 
 int suitableImage(struct singleEntry * e
      }
      dev = getpathbyspec(dev);
-     if (!dev)
+     if (!getpathbyspec(dev)) {
+         notSuitablePrintf(entry, "can't find blkid entry for %s\n", dev);
          return 0;
+     } else
+ 	dev = getpathbyspec(dev);
      rootdev = findDiskForRoot();
-     if (!rootdev)
+     if (!rootdev) {
+         notSuitablePrintf(entry, "can't find root device\n");
  	return 0;
+     }
      if (!getuuidbydev(rootdev) || !getuuidbydev(dev)) {
+         notSuitablePrintf(entry, "uuid missing: rootdev %s, dev %s\n",
+ 		getuuidbydev(rootdev), getuuidbydev(dev));
          free(rootdev);
          return 0;
      }
      if (strcmp(getuuidbydev(rootdev), getuuidbydev(dev))) {
+         notSuitablePrintf(entry, "uuid mismatch: rootdev %s, dev %s\n",
+ 		getuuidbydev(rootdev), getuuidbydev(dev));
  	free(rootdev);
          return 0;
      }
-Line 2468 
 int checkDeviceBootloader(const char * d
+Line 2543 
 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 3033 
 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 3233 
 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 3177 
 int main(int argc, const char ** argv) {
+Line 3265 
 int main(int argc, const char ** argv) {
  	      "the kernel referenced by the default image does not exist, "
  	      "the first linux entry whose kernel does exist is used as the "
  	      "template"), NULL },
+ 	{ "debug", 0, 0, &debug, 0,
+ 	    _("print debugging information for failures") },
  	{ "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 3416 
 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 3365 
 int main(int argc, const char ** argv) {
+Line 3459 
 int main(int argc, const char ** argv) {
  	defaultKernel = NULL;
      }
-     if (!strcmp(grubConfig, "-") && !outputFile) {
+     if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {
  	fprintf(stderr, _("grubby: output file must be specified if stdin "
  			"is used\n"));
  	return 1;
-Line 3373 
 int main(int argc, const char ** argv) {
+Line 3467 
 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 3562 
 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.1715
 


changed lines


 
Added in v.1745
 Legend:



Removed from v.1715
 


changed lines


 
Added in v.1745
-Removed from v.1715
+Added in v.1745