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

Diff of /trunk/grubby/grubby.c

Parent Directory | Revision Log | View Patch Patch

-revision 3003 by niro,
Tue Jun 27 14:14:00 2017 UTC
+revision 3027 by niro,
Tue Jun 27 14:45:42 2017 UTC
 Line 132 
 struct singleEntry {
  #define NEED_DEVTREE (1 << 6)
  #define MAIN_DEFAULT	    (1 << 0)
+ #define FIRST_ENTRY_INDEX    0	/* boot entry index value begin and increment
+ 				   from this initial value */
+ #define NO_DEFAULT_ENTRY    -1	/* indicates that no specific default boot
+ 				   entry was set or currently exists */
  #define DEFAULT_SAVED       -2
  #define DEFAULT_SAVED_GRUB2 -3
-Line 677 
 struct grubConfig {
+Line 681 
 struct grubConfig {
  	int fallbackImage;	/* just like defaultImage */
  	int flags;
  	struct configFileInfo *cfi;
+ 	int isModified;		/* assumes only one entry added
+ 				   per invocation of grubby */
  };
  blkid_cache blkid;
-Line 1296 
 static struct grubConfig *readConfig(con
+Line 1302 
 static struct grubConfig *readConfig(con
  	cfg->theLines = NULL;
  	cfg->entries = NULL;
  	cfg->fallbackImage = 0;
+ 	cfg->isModified = 0;
  	/* copy everything we have */
  	while (*head) {
-Line 1615 
 static struct grubConfig *readConfig(con
+Line 1622 
 static struct grubConfig *readConfig(con
  						*end == ' ' || *end == '\t'))
  					end++;
  				if (*end)
- 					cfg->defaultImage = -1;
+ 					cfg->defaultImage = NO_DEFAULT_ENTRY;
  			} else if (defaultLine->numElements == 3) {
  				char *value = defaultLine->elements[2].item;
  				while (*value && (*value == '"' ||
-Line 1628 
 static struct grubConfig *readConfig(con
+Line 1635 
 static struct grubConfig *readConfig(con
  						*end == ' ' || *end == '\t'))
  					end++;
  				if (*end)
- 					cfg->defaultImage = -1;
+ 					cfg->defaultImage = NO_DEFAULT_ENTRY;
  			}
  		} else if (cfi->defaultSupportSaved &&
  			   !strncmp(defaultLine->elements[1].item, "saved",
-Line 1638 
 static struct grubConfig *readConfig(con
+Line 1645 
 static struct grubConfig *readConfig(con
  			cfg->defaultImage =
  			    strtol(defaultLine->elements[1].item, &end, 10);
  			if (*end)
- 				cfg->defaultImage = -1;
+ 				cfg->defaultImage = NO_DEFAULT_ENTRY;
  		} else if (defaultLine->numElements >= 2) {
  			int i = 0;
  			while ((entry = findEntryByIndex(cfg, i))) {
-Line 1666 
 static struct grubConfig *readConfig(con
+Line 1673 
 static struct grubConfig *readConfig(con
  			if (entry) {
  				cfg->defaultImage = i;
  			} else {
- 				cfg->defaultImage = -1;
+ 				cfg->defaultImage = NO_DEFAULT_ENTRY;
  			}
  		}
  	} else if (cfg->cfi->defaultIsSaved && cfg->cfi->getEnv) {
-Line 1683 
 static struct grubConfig *readConfig(con
+Line 1690 
 static struct grubConfig *readConfig(con
  				cfg->defaultImage = index;
  		}
  	} else {
- 		cfg->defaultImage = 0;
+ 		cfg->defaultImage = FIRST_ENTRY_INDEX;
  	}
  	return cfg;
-Line 1703 
 static void writeDefault(FILE * out, cha
+Line 1710 
 static void writeDefault(FILE * out, cha
  		fprintf(out, "%sdefault%ssaved\n", indent, separator);
  	else if (cfg->cfi->defaultIsSaved) {
  		fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
- 		if (cfg->defaultImage >= 0 && cfg->cfi->setEnv) {
+ 		if (cfg->defaultImage >= FIRST_ENTRY_INDEX && cfg->cfi->setEnv) {
  			char *title;
- 			entry = findEntryByIndex(cfg, cfg->defaultImage);
+ 			int trueIndex, currentIndex;
+ 			trueIndex = 0;
+ 			currentIndex = 0;
+ 			while ((entry = findEntryByIndex(cfg, currentIndex))) {
+ 				if (!entry->skip) {
+ 					if (trueIndex == cfg->defaultImage) {
+ 						break;
+ 					}
+ 					trueIndex++;
+ 				}
+ 				currentIndex++;
+ 			}
  			line = getLineByType(LT_MENUENTRY, entry->lines);
  			if (!line)
  				line = getLineByType(LT_TITLE, entry->lines);
-Line 1716 
 static void writeDefault(FILE * out, cha
+Line 1736 
 static void writeDefault(FILE * out, cha
  							 "saved_entry", title);
  			}
  		}
- 	} else if (cfg->defaultImage > -1) {
+ 	} else if (cfg->defaultImage >= FIRST_ENTRY_INDEX) {
  		if (cfg->cfi->defaultIsIndex) {
  			if (cfg->cfi->defaultIsVariable) {
  				fprintf(out, "%sset default=\"%d\"\n", indent,
-Line 2420 
 struct singleEntry *findTemplate(struct
+Line 2440 
 struct singleEntry *findTemplate(struct
  				}
  			}
  		}
- 	} else if (cfg->defaultImage > -1) {
+ 	} else if (cfg->defaultImage >= FIRST_ENTRY_INDEX) {
  		entry = findEntryByIndex(cfg, cfg->defaultImage);
  		if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
  			if (indexPtr)
-Line 2432 
 struct singleEntry *findTemplate(struct
+Line 2452 
 struct singleEntry *findTemplate(struct
  	index = 0;
  	while ((entry = findEntryByIndex(cfg, index))) {
  		if (suitableImage(entry, prefix, skipRemoved, flags)) {
- 			int j;
+ 			int j, unmodifiedIndex;
- 			for (j = 0; j < index; j++) {
+ 			unmodifiedIndex = index;
+ 			for (j = 0; j < unmodifiedIndex; j++) {
  				entry2 = findEntryByIndex(cfg, j);
  				if (entry2->skip)
  					index--;
-Line 2494 
 void markRemovedImage(struct grubConfig
+Line 2517 
 void markRemovedImage(struct grubConfig
  		entry->skip = 1;
  }
- void setDefaultImage(struct grubConfig *config, int hasNew,
+ void setDefaultImage(struct grubConfig *config, int isAddingBootEntry,
- 		     const char *defaultKernelPath, int newIsDefault,
+ 		     const char *defaultKernelPath, int newBootEntryIsDefault,
- 		     const char *prefix, int flags, int index)
+ 		     const char *prefix, int flags,
- {
+ 		     int newDefaultBootEntryIndex, int newBootEntryIndex)
- 	struct singleEntry *entry, *entry2, *newDefault;
+ {
- 	int i, j;
+ 	struct singleEntry *bootEntry, *newDefault;
+ 	int indexToVerify, firstKernelEntryIndex, currentLookupIndex;
- 	if (newIsDefault) {
- 		config->defaultImage = 0;
+         /* initialize */
- 		return;
+         currentLookupIndex = FIRST_ENTRY_INDEX;
- 	} else if ((index >= 0) && config->cfi->defaultIsIndex) {
- 		if (findEntryByIndex(config, index))
+ 	/* handle the two cases where the user explictly picks the default
- 			config->defaultImage = index;
+ 	 * boot entry index as it would exist post-modification */
- 		else
- 			config->defaultImage = -1;
+ 	/* Case 1: user chose to make the latest boot entry the default */
+ 	if (newBootEntryIsDefault) {
+ 		config->defaultImage = newBootEntryIndex;
  		return;
- 	} else if (defaultKernelPath) {
+ 	}
- 		i = 0;
- 		if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {
+ 	/* Case 2: user picked an arbitrary index as the default boot entry */
- 			config->defaultImage = i;
+ 	if (newDefaultBootEntryIndex >= FIRST_ENTRY_INDEX
- 		} else {
+ 	    && config->cfi->defaultIsIndex) {
- 			config->defaultImage = -1;
+ 		indexToVerify = newDefaultBootEntryIndex;
+ 		/* user chose to make latest boot entry the default */
+ 		if (newDefaultBootEntryIndex == newBootEntryIndex) {
+ 			config->defaultImage = newBootEntryIndex;
  			return;
  		}
- 	}
- 	/* defaultImage now points to what we'd like to use, but before any
+ 		/* the user picks the default index based on the
- 	 * order changes */
+ 		 * order of the bootloader configuration after
- 	if ((config->defaultImage == DEFAULT_SAVED) ||
+ 		 * modification; ensure we are checking for the
- 	    (config->defaultImage == DEFAULT_SAVED_GRUB2))
+ 		 * existence of the correct entry */
- 		/* default is set to saved, we don't want to change it */
+ 		if (newBootEntryIndex < newDefaultBootEntryIndex) {
+ 			if (!config->isModified)
+ 				indexToVerify--;
+ 		}
+ 		/* verify the user selected index will exist */
+ 		if (findEntryByIndex(config, indexToVerify)) {
+ 			config->defaultImage = newDefaultBootEntryIndex;
+ 		} else {
+ 			config->defaultImage = NO_DEFAULT_ENTRY;
+ 		}
  		return;
+ 	}
- 	if (config->defaultImage > -1)
+ 	/* handle cases where the index value may shift */
- 		entry = findEntryByIndex(config, config->defaultImage);
- 	else
- 		entry = NULL;
- 	if (entry && !entry->skip) {
+ 	/* check validity of existing default or first-entry-found
- 		/* we can preserve the default */
+ 	   selection */
- 		if (hasNew)
+ 	if (defaultKernelPath) {
- 			config->defaultImage++;
+                 /* we must initialize this */
+                 firstKernelEntryIndex = 0;
+ 		/* user requested first-entry-found */
+ 		if (!findEntryByPath(config, defaultKernelPath,
+ 				     prefix, &firstKernelEntryIndex)) {
+ 			/* don't change default if can't find match */
+ 			config->defaultImage = NO_DEFAULT_ENTRY;
+ 			return;
+ 		}
- 		/* count the number of entries erased before this one */
+ 		config->defaultImage = firstKernelEntryIndex;
- 		for (j = 0; j < config->defaultImage; j++) {
- 			entry2 = findEntryByIndex(config, j);
+ 		/* this is where we start looking for decrement later */
- 			if (entry2->skip)
+ 		currentLookupIndex = config->defaultImage;
- 				config->defaultImage--;
+ 		if (isAddingBootEntry && !config->isModified &&
+ 		    (newBootEntryIndex < config->defaultImage)) {
+ 			/* increment because new entry added before default */
+ 			config->defaultImage++;
  		}
- 	} else if (hasNew) {
- 		config->defaultImage = 0;
  	} else {
- 		/* Either we just erased the default (or the default line was
+                 /* check to see if the default is stored in the environment */
- 		 * bad to begin with) and didn't put a new one in. We'll use
+                 if (config->defaultImage < FIRST_ENTRY_INDEX) {
- 		 * the first valid image. */
+                     if (config->defaultImage == DEFAULT_SAVED || config->defaultImage == DEFAULT_SAVED_GRUB2)
+                     {
+                         if (config->cfi->defaultIsSaved) {
+                             if (config->cfi->getEnv) {
+                                 char *defaultTitle = config->cfi->getEnv(config->cfi, "saved_entry");
+                                 if (defaultTitle) {
+                                     if (isnumber(defaultTitle)) {
+                                         currentLookupIndex = atoi(defaultTitle);
+                                     } else {
+                                         findEntryByTitle(config, defaultTitle, &currentLookupIndex);
+                                     }
+                                     /* set the default Image to an actual index */
+                                     config->defaultImage = currentLookupIndex;
+                                 }
+                             }
+                          }
+                     }
+                 } else {
+                         /* use pre-existing default entry from the file*/
+                         currentLookupIndex = config->defaultImage;
+                 }
+ 		if (isAddingBootEntry
+ 		    && (newBootEntryIndex <= config->defaultImage)) {
+ 			config->defaultImage++;
+ 			if (config->isModified) {
+ 				currentLookupIndex++;
+ 			}
+ 		}
+ 	}
+ 	/* sanity check - is this entry index valid? */
+ 	bootEntry = findEntryByIndex(config, currentLookupIndex);
+ 	if ((bootEntry && bootEntry->skip) || !bootEntry) {
+ 		/* entry is to be skipped or is invalid */
+ 		if (isAddingBootEntry) {
+ 			config->defaultImage = newBootEntryIndex;
+ 			return;
+ 		}
  		newDefault =
  		    findTemplate(config, prefix, &config->defaultImage, 1,
  				 flags);
- 		if (!newDefault)
+ 		if (!newDefault) {
- 			config->defaultImage = -1;
+ 			config->defaultImage = NO_DEFAULT_ENTRY;
+ 		}
+ 		return;
+ 	}
+ 	currentLookupIndex--;
+ 	/* decrement index by the total number of entries deleted */
+ 	for (indexToVerify = currentLookupIndex;
+ 	     indexToVerify >= FIRST_ENTRY_INDEX; indexToVerify--) {
+ 		bootEntry = findEntryByIndex(config, indexToVerify);
+ 		if (bootEntry && bootEntry->skip) {
+ 			config->defaultImage--;
+ 		}
  	}
  }
-Line 4210 
 int addNewKernel(struct grubConfig *conf
+Line 4315 
 int addNewKernel(struct grubConfig *conf
  		 const char *newKernelArgs, const char *newKernelInitrd,
  		 const char **extraInitrds, int extraInitrdCount,
  		 const char *newMBKernel, const char *newMBKernelArgs,
- 		 const char *newDevTreePath)
+ 		 const char *newDevTreePath, int newIndex)
  {
- 	struct singleEntry *new;
+ 	struct singleEntry *new, *entry, *prev = NULL;
  	struct singleLine *newLine = NULL, *tmplLine = NULL, *masterLine = NULL;
  	int needs;
+ 	char *indexs;
  	char *chptr;
+ 	int rc;
  	if (!newKernelPath)
  		return 0;
+ 	rc = asprintf(&indexs, "%d", newIndex);
+ 	if (rc < 0)
+ 		return 1;
  	/* if the newKernelTitle is too long silently munge it into something
  	 * we can live with. truncating is first check, then we'll just mess with
  	 * it until it looks better */
-Line 4242 
 int addNewKernel(struct grubConfig *conf
+Line 4353 
 int addNewKernel(struct grubConfig *conf
  	new = malloc(sizeof(*new));
  	new->skip = 0;
  	new->multiboot = 0;
- 	new->next = config->entries;
  	new->lines = NULL;
- 	config->entries = new;
+ 	entry = config->entries;
+ 	for (unsigned int i = 0; i < newIndex; i++) {
+ 		if (!entry)
+ 			break;
+ 		prev = entry;
+ 		entry = entry->next;
+ 	}
+ 	new->next = entry;
+ 	if (prev)
+ 		prev->next = new;
+ 	else
+ 		config->entries = new;
  	/* copy/update from the template */
  	needs = NEED_KERNEL | NEED_TITLE;
-Line 4707 
 int addNewKernel(struct grubConfig *conf
+Line 4829 
 int addNewKernel(struct grubConfig *conf
  		abort();
  	}
- 	if (updateImage(config, "0", prefix, newKernelArgs, NULL,
+ 	if (updateImage(config, indexs, prefix, newKernelArgs, NULL,
- 			newMBKernelArgs, NULL))
+ 			newMBKernelArgs, NULL)) {
+ 		config->isModified = 1;
  		return 1;
+ 	}
  	return 0;
  }
-Line 4737 
 int main(int argc, const char **argv)
+Line 4861 
 int main(int argc, const char **argv)
  	char *newDevTreePath = NULL;
  	char *newMBKernel = NULL;
  	char *newMBKernelArgs = NULL;
+ 	int newIndex = 0;
  	char *removeMBKernelArgs = NULL;
  	char *removeMBKernel = NULL;
  	char *bootPrefix = NULL;
-Line 4771 
 int main(int argc, const char **argv)
+Line 4896 
 int main(int argc, const char **argv)
  		 NULL},
  		{"boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
  		 _
- 		 ("filestystem which contains /boot directory (for testing only)"),
+ 		 ("filesystem which contains /boot directory (for testing only)"),
  		 _("bootfs")},
  #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
  		{"bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
-Line 4843 
 int main(int argc, const char **argv)
+Line 4968 
 int main(int argc, const char **argv)
  		{"set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,
  		 _("make the given entry index the default entry"),
  		 _("entry-index")},
+ 		{"set-index", 0, POPT_ARG_INT, &newIndex, 0,
+ 		 _("use the given index when creating a new entry"),
+ 		 _("entry-index")},
  		{"silo", 0, POPT_ARG_NONE, &configureSilo, 0,
  		 _("configure silo bootloader")},
  		{"title", 0, POPT_ARG_STRING, &newKernelTitle, 0,
-Line 5157 
 int main(int argc, const char **argv)
+Line 5285 
 int main(int argc, const char **argv)
  		struct singleEntry *entry;
  		char *rootspec;
- 		if (config->defaultImage == -1)
+ 		if (config->defaultImage == NO_DEFAULT_ENTRY)
  			return 0;
  		if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
  		    cfi->defaultIsSaved)
- 			config->defaultImage = 0;
+ 			config->defaultImage = FIRST_ENTRY_INDEX;
  		entry = findEntryByIndex(config, config->defaultImage);
  		if (!entry)
  			return 0;
-Line 5184 
 int main(int argc, const char **argv)
+Line 5312 
 int main(int argc, const char **argv)
  		struct singleLine *line;
  		struct singleEntry *entry;
- 		if (config->defaultImage == -1)
+ 		if (config->defaultImage == NO_DEFAULT_ENTRY)
  			return 0;
  		if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
  		    cfi->defaultIsSaved)
- 			config->defaultImage = 0;
+ 			config->defaultImage = FIRST_ENTRY_INDEX;
  		entry = findEntryByIndex(config, config->defaultImage);
  		if (!entry)
  			return 0;
-Line 5218 
 int main(int argc, const char **argv)
+Line 5346 
 int main(int argc, const char **argv)
  		return 0;
  	} else if (displayDefaultIndex) {
- 		if (config->defaultImage == -1)
+ 		if (config->defaultImage == NO_DEFAULT_ENTRY)
  			return 0;
  		if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
  		    cfi->defaultIsSaved)
- 			config->defaultImage = 0;
+ 			config->defaultImage = FIRST_ENTRY_INDEX;
  		printf("%i\n", config->defaultImage);
  		return 0;
-Line 5238 
 int main(int argc, const char **argv)
+Line 5366 
 int main(int argc, const char **argv)
  	markRemovedImage(config, removeKernelPath, bootPrefix);
  	markRemovedImage(config, removeMBKernel, bootPrefix);
  	setDefaultImage(config, newKernelPath != NULL, defaultKernel,
- 			makeDefault, bootPrefix, flags, defaultIndex);
+ 			makeDefault, bootPrefix, flags, defaultIndex,
+ 			newIndex);
  	setFallbackImage(config, newKernelPath != NULL);
  	if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
  			removeArgs, newMBKernelArgs, removeMBKernelArgs))
-Line 5258 
 int main(int argc, const char **argv)
+Line 5387 
 int main(int argc, const char **argv)
  	if (addNewKernel(config, template, bootPrefix, newKernelPath,
  			 newKernelTitle, newKernelArgs, newKernelInitrd,
  			 (const char **)extraInitrds, extraInitrdCount,
- 			 newMBKernel, newMBKernelArgs, newDevTreePath))
+ 			 newMBKernel, newMBKernelArgs, newDevTreePath,
+ 			 newIndex))
  		return 1;
  	if (numEntries(config) == 0) {

 Legend:



Removed from v.3003
 


changed lines


 
Added in v.3027
 Legend:



Removed from v.3003
 


changed lines


 
Added in v.3027
-Removed from v.3003
+Added in v.3027