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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1727 by niro,
Sat Feb 18 00:57:49 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 */
-Line 1338 
 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 1347 
 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 1378 
 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 1392 
 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 3193 
 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,

 Legend:



Removed from v.1727
 


changed lines


 
Added in v.1745
 Legend:



Removed from v.1727
 


changed lines


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