/[magellan-source]/trunk/grubby/grubby.c

Diff of /trunk/grubby/grubby.c

Parent Directory | Revision Log | View Patch Patch

-revision 2685 by niro,
Wed Jul 16 10:38:09 2014 UTC
+revision 2977 by niro,
Thu Jun 30 10:24:27 2016 UTC
 Line 60 
 int debug = 0;	/* Currently just for tem
  int isEfi = 0;
+ #if defined(__aarch64__)
+ #define isEfiOnly	1
+ #else
+ #define isEfiOnly	0
+ #endif
  char *saved_command_line = NULL;
  /* comments get lumped in with indention */
-Line 155 
 struct configFileInfo {
+Line 161 
 struct configFileInfo {
      int defaultIsVariable;
      int defaultSupportSaved;
      int defaultIsSaved;
+     int defaultIsUnquoted;
      enum lineType_e entryStart;
      enum lineType_e entryEnd;
      int needsBootPrefix;
-Line 575 
 struct keywordTypes extlinuxKeywords[] =
+Line 582 
 struct keywordTypes extlinuxKeywords[] =
      { "initrd",	    LT_INITRD,      ' ',	',' },
      { "append",	    LT_KERNELARGS,  ' ' },
      { "prompt",     LT_UNKNOWN,     ' ' },
+     { "fdt",        LT_DEVTREE,     ' ' },
+     { "fdtdir",     LT_DEVTREE,     ' ' },
      { NULL,	    0, 0 },
  };
  int useextlinuxmenu;
-Line 630 
 struct configFileInfo extlinuxConfigType
+Line 639 
 struct configFileInfo extlinuxConfigType
      .needsBootPrefix = 1,
      .maxTitleLength = 255,
      .mbAllowExtraInitRds = 1,
+     .defaultIsUnquoted = 1,
  };
  struct grubConfig {
-Line 721 
 static enum lineType_e preferredLineType
+Line 731 
 static enum lineType_e preferredLineType
      if (isEfi && cfi == &grub2ConfigType) {
  	switch (type) {
  	case LT_KERNEL:
- 	    return LT_KERNEL_EFI;
+ 	    return isEfiOnly ? LT_KERNEL : LT_KERNEL_EFI;
  	case LT_INITRD:
- 	    return LT_INITRD_EFI;
+ 	    return isEfiOnly ? LT_INITRD : LT_INITRD_EFI;
  	default:
  	    return type;
  	}
-Line 819 
 static int isEntryStart(struct singleLin
+Line 829 
 static int isEntryStart(struct singleLin
  /* extract the title from within brackets (for zipl) */
  static char * extractTitle(struct singleLine * line) {
-     /* bracketed title... let's extract it (leaks a byte) */
+     /* bracketed title... let's extract it */
      char * title = NULL;
      if (line->type == LT_TITLE) {
- 	title = strdup(line->elements[0].item);
+ 	title = strdup(line->elements[0].item + 1);
- 	title++;
  	*(title + strlen(title) - 1) = '\0';
      } else if (line->type == LT_MENUENTRY)
  	title = strdup(line->elements[1].item);
-Line 1185 
 static struct grubConfig * readConfig(co
+Line 1194 
 static struct grubConfig * readConfig(co
  		cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
  		defaultLine = line;
  	    }
- 	} else if (line->type == LT_DEFAULT && line->numElements == 2) {
- 	    cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
- 	    defaultLine = line;
          } 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
  	     */
- 	    if (entry->multiboot)
+ 	    if (entry && entry->multiboot)
  		line->type = LT_HYPER;
          } else if (line->type == LT_MBMODULE) {
-Line 1220 
 static struct grubConfig * readConfig(co
+Line 1226 
 static struct grubConfig * readConfig(co
  	    cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);
  	    if (*end) cfg->fallbackImage = -1;
- 	} else if (line->type == LT_TITLE && line->numElements > 1) {
+ 	} else if ((line->type == LT_DEFAULT && cfi->defaultIsUnquoted) ||
- 	    /* make the title a single argument (undoing our parsing) */
+                 (line->type == LT_TITLE && line->numElements > 1)) {
+ 	    /* make the title/default a single argument (undoing our parsing) */
  	    len = 0;
  	    for (int i = 1; i < line->numElements; i++) {
  		len += strlen(line->elements[i].item);
-Line 1328 
 static struct grubConfig * readConfig(co
+Line 1335 
 static struct grubConfig * readConfig(co
  	    }
  	}
+ 	if (line->type == LT_DEFAULT && line->numElements == 2) {
+ 	    cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
+ 	    defaultLine = line;
+ 	}
  	/* If we find a generic config option which should live at the
  	   top of the file, move it there. Old versions of grubby were
  	   probably responsible for putting new images in the wrong
-Line 1949 
 struct singleEntry * findEntryByPath(str
+Line 1961 
 struct singleEntry * findEntryByPath(str
  	}
  	indexVars[i + 1] = -1;
  	i = 0;
  	if (index) {
- 	    while (i < *index) i++;
+ 	    while (i < *index) {
- 	    if (indexVars[i] == -1) return NULL;
+ 		i++;
+ 		if (indexVars[i] == -1) return NULL;
+ 	    }
  	}
  	entry = findEntryByIndex(config, indexVars[i]);
-Line 2107 
 struct singleEntry * findTemplate(struct
+Line 2121 
 struct singleEntry * findTemplate(struct
  		} else {
  		    entry = findEntryByTitle(cfg, defTitle, &index);
  		}
- 		if (entry)
+ 		if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
  		    cfg->defaultImage = index;
+ 		    if (indexPtr)
+ 			*indexPtr = index;
+ 		    return entry;
+ 		}
  	    }
  	}
      } else if (cfg->defaultImage > -1) {
-Line 2265 
 void displayEntry(struct singleEntry * e
+Line 2283 
 void displayEntry(struct singleEntry * e
      struct singleLine * line;
      char * root = NULL;
      int i;
+     int j;
      printf("index=%d\n", index);
-Line 2352 
 void displayEntry(struct singleEntry * e
+Line 2371 
 void displayEntry(struct singleEntry * e
      } else {
  	char * title;
  	line = getLineByType(LT_MENUENTRY, entry->lines);
- 	title = grub2ExtractTitle(line);
+ 	if (line) {
- 	if (title)
+ 	    title = grub2ExtractTitle(line);
- 	    printf("title=%s\n", title);
+ 	    if (title)
+ 		printf("title=%s\n", title);
+ 	}
+     }
+     for (j = 0, line = entry->lines; line; line = line->next) {
+ 	if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
+ 	    if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
+ 		printf("mbmodule%d=", j);
+ 	    else
+ 		printf("mbmodule%d=%s", j, prefix);
+ 	    for (i = 1; i < line->numElements; i++)
+ 		printf("%s%s", line->elements[i].item, line->elements[i].indent);
+ 	    printf("\n");
+ 	    j++;
+ 	}
      }
  }
-Line 3277 
 int updateImage(struct grubConfig * cfg,
+Line 3312 
 int updateImage(struct grubConfig * cfg,
  }
  int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
- 		 const char * image, const char * prefix, const char * initrd) {
+ 		 const char * image, const char * prefix, const char * initrd,
+ 		 const char * title) {
      struct singleEntry * entry;
      struct singleLine * line, * kernelLine, *endLine = NULL;
      int index = 0;
      if (!image) return 0;
-     for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {
+     for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
          kernelLine = getLineByType(LT_MBMODULE, entry->lines);
          if (!kernelLine) continue;
+ 	/* if title is supplied, the entry's title must match it. */
+ 	if (title) {
+ 	    char *linetitle;
+ 	    line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
+ 	    if (!line)
+ 		continue;
+ 	    linetitle = extractTitle(line);
+ 	    if (!linetitle)
+ 		continue;
+ 	    if (strcmp(title, linetitle)) {
+ 		free(linetitle);
+ 		continue;
+ 	    }
+ 	    free(linetitle);
+ 	}
          if (prefix) {
              int prefixLen = strlen(prefix);
              if (!strncmp(initrd, prefix, prefixLen))
-Line 3313 
 int addMBInitrd(struct grubConfig * cfg,
+Line 3367 
 int addMBInitrd(struct grubConfig * cfg,
  }
  int updateInitrd(struct grubConfig * cfg, const char * image,
-                  const char * prefix, const char * initrd) {
+                  const char * prefix, const char * initrd, const char * title) {
      struct singleEntry * entry;
      struct singleLine * line, * kernelLine, *endLine = NULL;
      int index = 0;
-Line 3324 
 int updateInitrd(struct grubConfig * cfg
+Line 3378 
 int updateInitrd(struct grubConfig * cfg
          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
          if (!kernelLine) continue;
+ 	/* if title is supplied, the entry's title must match it. */
+ 	if (title) {
+ 	    char *linetitle;
+ 	    line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
+ 	    if (!line)
+ 		continue;
+ 	    linetitle = extractTitle(line);
+ 	    if (!linetitle)
+ 		continue;
+ 	    if (strcmp(title, linetitle)) {
+ 		free(linetitle);
+ 		continue;
+ 	    }
+ 	    free(linetitle);
+ 	}
          line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
          if (line)
              removeLine(entry, line);
-Line 4027 
 int addNewKernel(struct grubConfig * con
+Line 4099 
 int addNewKernel(struct grubConfig * con
  	}
      }
+     struct singleLine *endLine = NULL;
+     endLine = getLineByType(LT_ENTRY_END, new->lines);
+     if (endLine) {
+ 	    removeLine(new, endLine);
+ 	    needs |= NEED_END;
+     }
      /* add the remainder of the lines, i.e. those that either
       * weren't present in the template, or in the case of no template,
       * all the lines following the entryStart.
-Line 4085 
 int addNewKernel(struct grubConfig * con
+Line 4164 
 int addNewKernel(struct grubConfig * con
  			config->secondaryIndent, NULL);
  	needs &= ~NEED_END;
      }
      if (needs) {
  	printf(_("grubby: needs=%d, aborting\n"), needs);
  	abort();
-Line 4190 
 int main(int argc, const char ** argv) {
+Line 4270 
 int main(int argc, const char ** argv) {
  	    _("display the title of the default kernel") },
  	{ "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0,
  	    _("device tree file for new stanza"), _("dtb-path") },
+ 	{ "devtreedir", 0, POPT_ARG_STRING, &newDevTreePath, 0,
+ 	    _("device tree directory for new stanza"), _("dtb-path") },
  	{ "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
  	    _("configure elilo bootloader") },
  	{ "efi", 0, POPT_ARG_NONE, &isEfi, 0,
-Line 4374 
 int main(int argc, const char ** argv) {
+Line 4456 
 int main(int argc, const char ** argv) {
      if (newKernelPath && !newKernelTitle) {
  	fprintf(stderr, _("grubby: kernel title must be specified\n"));
  	return 1;
-     } else if (!newKernelPath && (newKernelTitle  || copyDefault ||
+     } else if (!newKernelPath && (copyDefault ||
  				  (newKernelInitrd && !updateKernelPath)||
  				  makeDefault || extraInitrdCount > 0)) {
  	fprintf(stderr, _("grubby: kernel path expected\n"));
-Line 4596 
 int main(int argc, const char ** argv) {
+Line 4678 
 int main(int argc, const char ** argv) {
      if (updateKernelPath && newKernelInitrd) {
  	    if (newMBKernel) {
  		    if (addMBInitrd(config, newMBKernel, updateKernelPath,
- 					bootPrefix, newKernelInitrd))
+ 					bootPrefix, newKernelInitrd,
+ 					newKernelTitle))
  			    return 1;
  	    } else {
  		    if (updateInitrd(config, updateKernelPath, bootPrefix,
- 					newKernelInitrd))
+ 					newKernelInitrd, newKernelTitle))
  			return 1;
  	    }
      }

 Legend:



Removed from v.2685
 


changed lines


 
Added in v.2977
 Legend:



Removed from v.2685
 


changed lines


 
Added in v.2977
-Removed from v.2685
+Added in v.2977