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

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

Parent Directory | Revision Log | View Patch Patch

-revision 2058 by niro,
Wed Feb 20 14:06:30 2013 UTC
+revision 2263 by niro,
Mon Oct 21 14:08:21 2013 UTC
 Line 36
  #include <signal.h>
  #include <blkid/blkid.h>
+ #include "log.h"
  #ifndef DEBUG
  #define DEBUG 0
  #endif
-Line 58 
 int debug = 0;	/* Currently just for tem
+Line 60 
 int debug = 0;	/* Currently just for tem
  int isEfi = 0;
+ char *saved_command_line = NULL;
  /* comments get lumped in with indention */
  struct lineElement {
      char * item;
-Line 132 
 struct configFileInfo;
+Line 136 
 struct configFileInfo;
  typedef const char *(*findConfigFunc)(struct configFileInfo *);
  typedef const int (*writeLineFunc)(struct configFileInfo *,
  				struct singleLine *line);
+ typedef char *(*getEnvFunc)(struct configFileInfo *, char *name);
+ typedef int (*setEnvFunc)(struct configFileInfo *, char *name, char *value);
  struct configFileInfo {
      char * defaultConfig;
      findConfigFunc findConfig;
      writeLineFunc writeLine;
+     getEnvFunc getEnv;
+     setEnvFunc setEnv;
      struct keywordTypes * keywords;
      int caseInsensitive;
      int defaultIsIndex;
      int defaultIsVariable;
      int defaultSupportSaved;
+     int defaultIsSaved;
      enum lineType_e entryStart;
      enum lineType_e entryEnd;
      int needsBootPrefix;
-Line 153 
 struct configFileInfo {
+Line 162 
 struct configFileInfo {
      int mbInitRdIsModule;
      int mbConcatArgs;
      int mbAllowExtraInitRds;
+     char *envFile;
  };
  struct keywordTypes grubKeywords[] = {
-Line 172 
 const char *grubFindConfig(struct config
+Line 182 
 const char *grubFindConfig(struct config
  	"/boot/grub/grub.conf",
  	"/boot/grub/menu.lst",
  	"/etc/grub.conf",
+ 	"/boot/grub2/grub.cfg",
+ 	"/boot/grub2-efi/grub.cfg",
  	NULL
      };
      static int i = -1;
-Line 226 
 const char *grub2FindConfig(struct confi
+Line 238 
 const char *grub2FindConfig(struct confi
      };
      static int i = -1;
      static const char *grub_cfg = "/boot/grub/grub.cfg";
+     int rc = -1;
      if (i == -1) {
  	for (i = 0; configFiles[i] != NULL; i++) {
  	    dbgPrintf("Checking \"%s\": ", configFiles[i]);
- 	    if (!access(configFiles[i], R_OK)) {
+ 	    if ((rc = access(configFiles[i], R_OK))) {
+ 		if (errno == EACCES) {
+ 		    printf("Unable to access bootloader configuration file "
+ 		    	   "\"%s\": %m\n", configFiles[i]);
+ 		    exit(1);
+ 		}
+ 		continue;
+ 	    } else {
  		dbgPrintf("found\n");
  		return configFiles[i];
  	    }
-Line 249 
 const char *grub2FindConfig(struct confi
+Line 269 
 const char *grub2FindConfig(struct confi
      return configFiles[i];
  }
+ /* kind of hacky.  It'll give the first 1024 bytes, ish. */
+ static char *grub2GetEnv(struct configFileInfo *info, char *name)
+ {
+     static char buf[1025];
+     char *s = NULL;
+     char *ret = NULL;
+     char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv";
+     int rc = asprintf(&s, "grub2-editenv %s list | grep '^%s='", envFile, name);
+     if (rc < 0)
+ 	return NULL;
+     FILE *f = popen(s, "r");
+     if (!f)
+ 	goto out;
+     memset(buf, '\0', sizeof (buf));
+     ret = fgets(buf, 1024, f);
+     pclose(f);
+     if (ret) {
+ 	ret += strlen(name) + 1;
+ 	ret[strlen(ret) - 1] = '\0';
+     }
+     dbgPrintf("grub2GetEnv(%s): %s\n", name, ret);
+ out:
+     free(s);
+     return ret;
+ }
+ static int sPopCount(const char *s, const char *c)
+ {
+     int ret = 0;
+     if (!s)
+ 	return -1;
+     for (int i = 0; s[i] != '\0'; i++)
+ 	for (int j = 0; c[j] != '\0'; j++)
+ 	    if (s[i] == c[j])
+ 		ret++;
+     return ret;
+ }
+ static char *shellEscape(const char *s)
+ {
+     int l = strlen(s) + sPopCount(s, "'") * 2;
+     char *ret = calloc(l+1, sizeof (*ret));
+     if (!ret)
+ 	return NULL;
+     for (int i = 0, j = 0; s[i] != '\0'; i++, j++) {
+ 	if (s[i] == '\'')
+ 	    ret[j++] = '\\';
+ 	ret[j] = s[i];
+     }
+     return ret;
+ }
+ static void unquote(char *s)
+ {
+     int l = strlen(s);
+     if ((s[l-1] == '\'' && s[0] == '\'') || (s[l-1] == '"' && s[0] == '"')) {
+ 	memmove(s, s+1, l-2);
+ 	s[l-2] = '\0';
+     }
+ }
+ static int grub2SetEnv(struct configFileInfo *info, char *name, char *value)
+ {
+     char *s = NULL;
+     int rc = 0;
+     char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv";
+     unquote(value);
+     value = shellEscape(value);
+     if (!value)
+ 	    return -1;
+     rc = asprintf(&s, "grub2-editenv %s set '%s=%s'", envFile, name, value);
+     free(value);
+     if (rc <0)
+ 	return -1;
+     dbgPrintf("grub2SetEnv(%s): %s\n", name, s);
+     rc = system(s);
+     free(s);
+     return rc;
+ }
+ /* this is a gigantic hack to avoid clobbering grub2 variables... */
+ static int is_special_grub2_variable(const char *name)
+ {
+     if (!strcmp(name,"\"${next_entry}\""))
+ 	return 1;
+     if (!strcmp(name,"\"${prev_saved_entry}\""))
+ 	return 1;
+     return 0;
+ }
  int sizeOfSingleLine(struct singleLine * line) {
    int count = 0;
-Line 343 
 char *grub2ExtractTitle(struct singleLin
+Line 462 
 char *grub2ExtractTitle(struct singleLin
  struct configFileInfo grub2ConfigType = {
      .findConfig = grub2FindConfig,
+     .getEnv = grub2GetEnv,
+     .setEnv = grub2SetEnv,
      .keywords = grub2Keywords,
      .defaultIsIndex = 1,
      .defaultSupportSaved = 1,
-Line 522 
 struct singleEntry * findEntryByIndex(st
+Line 643 
 struct singleEntry * findEntryByIndex(st
  struct singleEntry * findEntryByPath(struct grubConfig * cfg,
  				     const char * path, const char * prefix,
  				     int * index);
+ struct singleEntry * findEntryByTitle(struct grubConfig * cfg, char *title,
+ 				      int * index);
  static int readFile(int fd, char ** bufPtr);
  static void lineInit(struct singleLine * line);
  struct singleLine * lineDup(struct singleLine * line);
-Line 679 
 static int isEntryStart(struct singleLin
+Line 802 
 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) */
-     char * title;
+     char * title = NULL;
-     title = strdup(line->elements[0].item);
+     if (line->type == LT_TITLE) {
-     title++;
+ 	title = strdup(line->elements[0].item);
-     *(title + strlen(title) - 1) = '\0';
+ 	title++;
+ 	*(title + strlen(title) - 1) = '\0';
+     } else if (line->type == LT_MENUENTRY)
+ 	title = strdup(line->elements[1].item);
+     else
+ 	return NULL;
      return title;
  }
-Line 940 
 static int getNextLine(char ** bufPtr, s
+Line 1068 
 static int getNextLine(char ** bufPtr, s
      return 0;
  }
+ static int isnumber(const char *s)
+ {
+     int i;
+     for (i = 0; s[i] != '\0'; i++)
+ 	if (s[i] < '0' || s[i] > '9')
+ 	    return 0;
+     return i;
+ }
  static struct grubConfig * readConfig(const char * inName,
  				      struct configFileInfo * cfi) {
      int in;
-Line 954 
 static struct grubConfig * readConfig(co
+Line 1091 
 static struct grubConfig * readConfig(co
      int len;
      char * buf;
-     if (!strcmp(inName, "-")) {
+     if (inName == NULL) {
+         printf("Could not find bootloader configuration\n");
+         exit(1);
+     } else if (!strcmp(inName, "-")) {
  	in = 0;
      } else {
  	if ((in = open(inName, O_RDONLY)) < 0) {
-Line 1021 
 static struct grubConfig * readConfig(co
+Line 1161 
 static struct grubConfig * readConfig(co
  	    dbgPrintf("\n");
  	    struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
  	    if (kwType && line->numElements == 3 &&
- 		    !strcmp(line->elements[1].item, kwType->key)) {
+ 		    !strcmp(line->elements[1].item, kwType->key) &&
+ 		    !is_special_grub2_variable(line->elements[2].item)) {
  		dbgPrintf("Line sets default config\n");
  		cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
  		defaultLine = line;
-Line 1226 
 static struct grubConfig * readConfig(co
+Line 1367 
 static struct grubConfig * readConfig(co
          if (defaultLine->numElements > 2 &&
  	    cfi->defaultSupportSaved &&
  	    !strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {
- 	    cfg->defaultImage = DEFAULT_SAVED_GRUB2;
+ 		cfg->cfi->defaultIsSaved = 1;
+ 		cfg->defaultImage = DEFAULT_SAVED_GRUB2;
+ 		if (cfg->cfi->getEnv) {
+ 		    char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
+ 		    if (defTitle) {
+ 			int index = 0;
+ 			if (isnumber(defTitle)) {
+ 			    index = atoi(defTitle);
+ 			    entry = findEntryByIndex(cfg, index);
+ 			} else {
+ 			    entry = findEntryByTitle(cfg, defTitle, &index);
+ 			}
+ 			if (entry)
+ 			    cfg->defaultImage = index;
+ 		    }
+ 		}
  	} else if (cfi->defaultIsVariable) {
  	    char *value = defaultLine->elements[2].item;
  	    while (*value && (*value == '"' || *value == '\'' ||
-Line 1267 
 static struct grubConfig * readConfig(co
+Line 1423 
 static struct grubConfig * readConfig(co
  	        cfg->defaultImage = -1;
  	    }
  	}
+     } else if (cfg->cfi->defaultIsSaved && cfg->cfi->getEnv) {
+ 	char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
+ 	if (defTitle) {
+ 	    int index = 0;
+ 	    if (isnumber(defTitle)) {
+ 		index = atoi(defTitle);
+ 		entry = findEntryByIndex(cfg, index);
+ 	    } else {
+ 		entry = findEntryByTitle(cfg, defTitle, &index);
+ 	    }
+ 	    if (entry)
+ 		cfg->defaultImage = index;
+ 	}
      } else {
          cfg->defaultImage = 0;
      }
-Line 1284 
 static void writeDefault(FILE * out, cha
+Line 1453 
 static void writeDefault(FILE * out, cha
      if (cfg->defaultImage == DEFAULT_SAVED)
  	fprintf(out, "%sdefault%ssaved\n", indent, separator);
-     else if (cfg->defaultImage == DEFAULT_SAVED_GRUB2)
+     else if (cfg->cfi->defaultIsSaved) {
  	fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
-     else if (cfg->defaultImage > -1) {
+ 	if (cfg->defaultImage >= 0 && cfg->cfi->setEnv) {
+ 	    char *title;
+ 	    entry = findEntryByIndex(cfg, cfg->defaultImage);
+ 	    line = getLineByType(LT_MENUENTRY, entry->lines);
+ 	    if (!line)
+ 		line = getLineByType(LT_TITLE, entry->lines);
+ 	    if (line) {
+ 		title = extractTitle(line);
+ 		if (title)
+ 		    cfg->cfi->setEnv(cfg->cfi, "saved_entry", title);
+ 	    }
+ 	}
+     } else if (cfg->defaultImage > -1) {
  	if (cfg->cfi->defaultIsIndex) {
  	    if (cfg->cfi->defaultIsVariable) {
  	        fprintf(out, "%sset default=\"%d\"\n", indent,
-Line 1389 
 static int writeConfig(struct grubConfig
+Line 1570 
 static int writeConfig(struct grubConfig
      while (line) {
          if (line->type == LT_SET_VARIABLE && defaultKw &&
  		line->numElements == 3 &&
- 		!strcmp(line->elements[1].item, defaultKw->key)) {
+ 		!strcmp(line->elements[1].item, defaultKw->key) &&
+ 		!is_special_grub2_variable(line->elements[2].item)) {
  	    writeDefault(out, line->indent, line->elements[0].indent, cfg);
  	    needs &= ~MAIN_DEFAULT;
  	} else if (line->type == LT_DEFAULT) {
-Line 1534 
 static char *findDiskForRoot()
+Line 1716 
 static char *findDiskForRoot()
      return NULL;
  }
- void printEntry(struct singleEntry * entry) {
+ void printEntry(struct singleEntry * entry, FILE *f) {
      int i;
      struct singleLine * line;
      for (line = entry->lines; line; line = line->next) {
- 	fprintf(stderr, "DBG: %s", line->indent);
+ 	log_message(f, "DBG: %s", line->indent);
  	for (i = 0; i < line->numElements; i++) {
  	    /* Need to handle this, because we strip the quotes from
  	     * menuentry when read it. */
  	    if (line->type == LT_MENUENTRY && i == 1) {
  		if(!isquote(*line->elements[i].item))
- 		    fprintf(stderr, "\'%s\'", line->elements[i].item);
+ 		    log_message(f, "\'%s\'", line->elements[i].item);
  		else
- 		    fprintf(stderr, "%s", line->elements[i].item);
+ 		    log_message(f, "%s", line->elements[i].item);
- 		fprintf(stderr, "%s", line->elements[i].indent);
+ 		log_message(f, "%s", line->elements[i].indent);
  		continue;
  	    }
- 	    fprintf(stderr, "%s%s",
+ 	    log_message(f, "%s%s",
  		    line->elements[i].item, line->elements[i].indent);
  	}
- 	fprintf(stderr, "\n");
+ 	log_message(f, "\n");
      }
  }
- void notSuitablePrintf(struct singleEntry * entry, const char *fmt, ...)
+ void notSuitablePrintf(struct singleEntry * entry, int okay, const char *fmt, ...)
  {
-     va_list argp;
+     static int once;
+     va_list argp, argq;
+     va_start(argp, fmt);
+     va_copy(argq, argp);
+     if (!once) {
+ 	log_time(NULL);
+ 	log_message(NULL, "command line: %s\n", saved_command_line);
+     }
+     log_message(NULL, "DBG: Image entry %s: ", okay ? "succeeded" : "failed");
+     log_vmessage(NULL, fmt, argq);
+     printEntry(entry, NULL);
+     va_end(argq);
-     if (!debug)
+     if (!debug) {
+ 	once = 1;
+     	va_end(argp);
  	return;
+     }
-     va_start(argp, fmt);
+     if (okay) {
+ 	va_end(argp);
+ 	return;
+     }
+     if (!once)
+ 	log_message(stderr, "DBG: command line: %s\n", saved_command_line);
+     once = 1;
      fprintf(stderr, "DBG: Image entry failed: ");
      vfprintf(stderr, fmt, argp);
-     printEntry(entry);
+     printEntry(entry, stderr);
      va_end(argp);
  }
-Line 1597 
 int suitableImage(struct singleEntry * e
+Line 1803 
 int suitableImage(struct singleEntry * e
      char * rootdev;
      if (skipRemoved && entry->skip) {
- 	notSuitablePrintf(entry, "marked to skip\n");
+ 	notSuitablePrintf(entry, 0, "marked to skip\n");
  	return 0;
      }
      line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);
      if (!line) {
- 	notSuitablePrintf(entry, "no line found\n");
+ 	notSuitablePrintf(entry, 0, "no line found\n");
  	return 0;
      }
      if (line->numElements < 2) {
- 	notSuitablePrintf(entry, "line has only %d elements\n",
+ 	notSuitablePrintf(entry, 0, "line has only %d elements\n",
  	    line->numElements);
  	return 0;
      }
-     if (flags & GRUBBY_BADIMAGE_OKAY) return 1;
+     if (flags & GRUBBY_BADIMAGE_OKAY) {
+ 	    notSuitablePrintf(entry, 1, "\n");
+ 	    return 1;
+     }
      fullName = alloca(strlen(bootPrefix) +
  		      strlen(line->elements[1].item) + 1);
-Line 1623 
 int suitableImage(struct singleEntry * e
+Line 1832 
 int suitableImage(struct singleEntry * e
      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);
+ 	notSuitablePrintf(entry, 0, "access to %s failed\n", fullName);
  	return 0;
      }
      for (i = 2; i < line->numElements; i++)
-Line 1644 
 int suitableImage(struct singleEntry * e
+Line 1853 
 int suitableImage(struct singleEntry * e
              /* failed to find one */
              if (!line) {
- 		notSuitablePrintf(entry, "no line found\n");
+ 		notSuitablePrintf(entry, 0, "no line found\n");
  		return 0;
              }
-Line 1653 
 int suitableImage(struct singleEntry * e
+Line 1862 
 int suitableImage(struct singleEntry * e
  	    if (i < line->numElements)
  	        dev = line->elements[i].item + 5;
  	    else {
- 		notSuitablePrintf(entry, "no root= entry found\n");
+ 		notSuitablePrintf(entry, 0, "no root= entry found\n");
  		/* it failed too...  can't find root= */
  	        return 0;
              }
-Line 1662 
 int suitableImage(struct singleEntry * e
+Line 1871 
 int suitableImage(struct singleEntry * e
      dev = getpathbyspec(dev);
      if (!getpathbyspec(dev)) {
-         notSuitablePrintf(entry, "can't find blkid entry for %s\n", dev);
+         notSuitablePrintf(entry, 0, "can't find blkid entry for %s\n", dev);
          return 0;
      } else
  	dev = getpathbyspec(dev);
      rootdev = findDiskForRoot();
      if (!rootdev) {
-         notSuitablePrintf(entry, "can't find root device\n");
+         notSuitablePrintf(entry, 0, "can't find root device\n");
  	return 0;
      }
      if (!getuuidbydev(rootdev) || !getuuidbydev(dev)) {
-         notSuitablePrintf(entry, "uuid missing: rootdev %s, dev %s\n",
+         notSuitablePrintf(entry, 0, "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",
+         notSuitablePrintf(entry, 0, "uuid mismatch: rootdev %s, dev %s\n",
  		getuuidbydev(rootdev), getuuidbydev(dev));
  	free(rootdev);
          return 0;
      }
      free(rootdev);
+     notSuitablePrintf(entry, 1, "\n");
      return 1;
  }
-Line 1816 
 struct singleEntry * findEntryByPath(str
+Line 2026 
 struct singleEntry * findEntryByPath(str
      return entry;
  }
+ struct singleEntry * findEntryByTitle(struct grubConfig * cfg, char *title,
+ 				      int * index) {
+     struct singleEntry * entry;
+     struct singleLine * line;
+     int i;
+     char * newtitle;
+     for (i = 0, entry = cfg->entries; entry; entry = entry->next, i++) {
+ 	if (index && i < *index)
+ 	    continue;
+ 	line = getLineByType(LT_TITLE, entry->lines);
+ 	if (!line)
+ 	    line = getLineByType(LT_MENUENTRY, entry->lines);
+ 	if (!line)
+ 	    continue;
+ 	newtitle = grub2ExtractTitle(line);
+ 	if (!newtitle)
+ 	    continue;
+ 	if (!strcmp(title, newtitle))
+ 	    break;
+     }
+     if (!entry)
+ 	return NULL;
+     if (index)
+ 	*index = i;
+     return entry;
+ }
  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index) {
      struct singleEntry * entry;
-Line 1838 
 struct singleEntry * findTemplate(struct
+Line 2078 
 struct singleEntry * findTemplate(struct
      struct singleEntry * entry, * entry2;
      int index;
-     if (cfg->defaultImage > -1) {
+     if (cfg->cfi->defaultIsSaved) {
+ 	if (cfg->cfi->getEnv) {
+ 	    char *defTitle = cfg->cfi->getEnv(cfg->cfi, "saved_entry");
+ 	    if (defTitle) {
+ 		int index = 0;
+ 		if (isnumber(defTitle)) {
+ 		    index = atoi(defTitle);
+ 		    entry = findEntryByIndex(cfg, index);
+ 		} else {
+ 		    entry = findEntryByTitle(cfg, defTitle, &index);
+ 		}
+ 		if (entry)
+ 		    cfg->defaultImage = index;
+ 	    }
+ 	}
+     } else if (cfg->defaultImage > -1) {
  	entry = findEntryByIndex(cfg, cfg->defaultImage);
  	if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
  	    if (indexPtr) *indexPtr = cfg->defaultImage;
-Line 3003 
 int updateImage(struct grubConfig * cfg,
+Line 3258 
 int updateImage(struct grubConfig * cfg,
      return rc;
  }
+ int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
+ 		 const char * image, const char * prefix, const char * initrd) {
+     struct singleEntry * entry;
+     struct singleLine * line, * kernelLine, *endLine = NULL;
+     int index = 0;
+     if (!image) return 0;
+     for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {
+         kernelLine = getLineByType(LT_MBMODULE, entry->lines);
+         if (!kernelLine) continue;
+         if (prefix) {
+             int prefixLen = strlen(prefix);
+             if (!strncmp(initrd, prefix, prefixLen))
+                 initrd += prefixLen;
+         }
+ 	endLine = getLineByType(LT_ENTRY_END, entry->lines);
+ 	if (endLine)
+ 	    removeLine(entry, endLine);
+         line = addLine(entry, cfg->cfi, preferredLineType(LT_MBMODULE,cfg->cfi),
+ 			kernelLine->indent, initrd);
+         if (!line)
+ 	    return 1;
+ 	if (endLine) {
+ 	    line = addLine(entry, cfg->cfi, LT_ENTRY_END, "", NULL);
+             if (!line)
+ 		return 1;
+ 	}
+         break;
+     }
+     return 0;
+ }
  int updateInitrd(struct grubConfig * cfg, const char * image,
                   const char * prefix, const char * initrd) {
      struct singleEntry * entry;
-Line 3792 
 int main(int argc, const char ** argv) {
+Line 4083 
 int main(int argc, const char ** argv) {
      char * removeArgs = NULL;
      char * kernelInfo = NULL;
      char * extraInitrds[MAX_EXTRA_INITRDS] = { NULL };
+     char * envPath = NULL;
      const char * chptr = NULL;
      struct configFileInfo * cfi = NULL;
      struct grubConfig * config;
-Line 3843 
 int main(int argc, const char ** argv) {
+Line 4135 
 int main(int argc, const char ** argv) {
  	    _("configure elilo bootloader") },
  	{ "efi", 0, POPT_ARG_NONE, &isEfi, 0,
  	    _("force grub2 stanzas to use efi") },
+ 	{ "env", 0, POPT_ARG_STRING, &envPath, 0,
+ 	    _("path for environment data"),
+ 	    _("path") },
  	{ "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,
  	    _("configure extlinux bootloader (from syslinux)") },
  	{ "grub", 0, POPT_ARG_NONE, &configureGrub, 0,
-Line 3899 
 int main(int argc, const char ** argv) {
+Line 4194 
 int main(int argc, const char ** argv) {
      signal(SIGSEGV, traceback);
+     int i = 0;
+     for (int j = 1; j < argc; j++)
+ 	i += strlen(argv[j]) + 1;
+     saved_command_line = malloc(i);
+     if (!saved_command_line) {
+ 	fprintf(stderr, "grubby: %m\n");
+ 	exit(1);
+     }
+     saved_command_line[0] = '\0';
+     for (int j = 1; j < argc; j++) {
+ 	strcat(saved_command_line, argv[j]);
+ 	strncat(saved_command_line, j == argc -1 ? "" : " ", 1);
+     }
      optCon = poptGetContext("grubby", argc, argv, options, 0);
      poptReadDefaultConfig(optCon, 1);
-Line 3942 
 int main(int argc, const char ** argv) {
+Line 4251 
 int main(int argc, const char ** argv) {
  	return 1;
      } else if (configureGrub2) {
  	cfi = &grub2ConfigType;
+ 	if (envPath)
+ 	    cfi->envFile = envPath;
      } else if (configureLilo) {
  	cfi = &liloConfigType;
      } else if (configureGrub) {
-Line 4142 
 int main(int argc, const char ** argv) {
+Line 4453 
 int main(int argc, const char ** argv) {
  	return 0;
      }
+     if (grubConfig == NULL) {
+ 	printf("Could not find bootloader configuration file.\n");
+ 	exit(1);
+     }
      config = readConfig(grubConfig, cfi);
      if (!config) return 1;
-Line 4151 
 int main(int argc, const char ** argv) {
+Line 4467 
 int main(int argc, const char ** argv) {
          char * rootspec;
  	if (config->defaultImage == -1) return 0;
+ 	if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
+ 		cfi->defaultIsSaved)
+ 	    config->defaultImage = 0;
  	entry = findEntryByIndex(config, config->defaultImage);
  	if (!entry) return 0;
  	if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
-Line 4169 
 int main(int argc, const char ** argv) {
+Line 4488 
 int main(int argc, const char ** argv) {
  	struct singleEntry * entry;
  	if (config->defaultImage == -1) return 0;
+ 	if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
+ 		cfi->defaultIsSaved)
+ 	    config->defaultImage = 0;
  	entry = findEntryByIndex(config, config->defaultImage);
  	if (!entry) return 0;
-Line 4191 
 int main(int argc, const char ** argv) {
+Line 4513 
 int main(int argc, const char ** argv) {
      } else if (displayDefaultIndex) {
          if (config->defaultImage == -1) return 0;
+ 	if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
+ 		cfi->defaultIsSaved)
+ 	    config->defaultImage = 0;
          printf("%i\n", config->defaultImage);
+         return 0;
      } else if (kernelInfo)
  	return displayInfo(config, kernelInfo, bootPrefix);
-Line 4209 
 int main(int argc, const char ** argv) {
+Line 4535 
 int main(int argc, const char ** argv) {
      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
      if (updateKernelPath && newKernelInitrd) {
-             if (updateInitrd(config, updateKernelPath, bootPrefix,
+ 	    if (newMBKernel) {
-                              newKernelInitrd)) return 1;
+ 		    if (addMBInitrd(config, newMBKernel, updateKernelPath,
+ 					bootPrefix, newKernelInitrd))
+ 			    return 1;
+ 	    } else {
+ 		    if (updateInitrd(config, updateKernelPath, bootPrefix,
+ 					newKernelInitrd))
+ 			return 1;
+ 	    }
      }
      if (addNewKernel(config, template, bootPrefix, newKernelPath,
                       newKernelTitle, newKernelArgs, newKernelInitrd,

 Legend:



Removed from v.2058
 


changed lines


 
Added in v.2263
 Legend:



Removed from v.2058
 


changed lines


 
Added in v.2263
-Removed from v.2058
+Added in v.2263