Diff of /trunk/grubby/grubby.c

Parent Directory | Revision Log | Patch

	trunk/mkinitrd-magellan/grubby/grubby.c revision 1177 by niro, Wed Dec 15 21:16:32 2010 UTC	trunk/grubby/grubby.c revision 1864 by niro, Mon Jul 2 13:20:31 2012 UTC
#	Line 36	Line 36
36	#include <signal.h>	#include <signal.h>
37	#include <blkid/blkid.h>	#include <blkid/blkid.h>
38
39		#ifndef DEBUG
40	#define DEBUG 0	#define DEBUG 0
41		#endif
42
43	#if DEBUG	#if DEBUG
44	#define dbgPrintf(format, args...) fprintf(stderr, format , ## args)	#define dbgPrintf(format, args...) fprintf(stderr, format , ## args)
#	Line 44	Line 46
46	#define dbgPrintf(format, args...)	#define dbgPrintf(format, args...)
47	#endif	#endif
48
49		int debug = 0; /* Currently just for template debugging */
50
51	#define _(A) (A)	#define _(A) (A)
52
53	#define MAX_EXTRA_INITRDS  16 /* code segment checked by --bootloader-probe */	#define MAX_EXTRA_INITRDS  16 /* code segment checked by --bootloader-probe */
54	#define CODE_SEG_SIZE  128 /* code segment checked by --bootloader-probe */	#define CODE_SEG_SIZE  128 /* code segment checked by --bootloader-probe */
55
56		#define NOOP_OPCODE 0x90
57		#define JMP_SHORT_OPCODE 0xeb
58
59	/* comments get lumped in with indention */	/* comments get lumped in with indention */
60	struct lineElement {	struct lineElement {
61	char * item;	char * item;
#	Line 56  struct lineElement {	Line 63  struct lineElement {
63	};	};
64
65	enum lineType_e {	enum lineType_e {
66	LT_WHITESPACE = 1 << 0,	LT_WHITESPACE   = 1 << 0,
67	LT_TITLE      = 1 << 1,	LT_TITLE        = 1 << 1,
68	LT_KERNEL     = 1 << 2,	LT_KERNEL       = 1 << 2,
69	LT_INITRD     = 1 << 3,	LT_INITRD       = 1 << 3,
70	LT_HYPER      = 1 << 4,	LT_HYPER        = 1 << 4,
71	LT_DEFAULT    = 1 << 5,	LT_DEFAULT      = 1 << 5,
72	LT_MBMODULE   = 1 << 6,	LT_MBMODULE     = 1 << 6,
73	LT_ROOT       = 1 << 7,	LT_ROOT         = 1 << 7,
74	LT_FALLBACK   = 1 << 8,	LT_FALLBACK     = 1 << 8,
75	LT_KERNELARGS = 1 << 9,	LT_KERNELARGS   = 1 << 9,
76	LT_BOOT       = 1 << 10,	LT_BOOT         = 1 << 10,
77	LT_BOOTROOT   = 1 << 11,	LT_BOOTROOT     = 1 << 11,
78	LT_LBA        = 1 << 12,	LT_LBA          = 1 << 12,
79	LT_OTHER      = 1 << 13,	LT_OTHER        = 1 << 13,
80	LT_GENERIC    = 1 << 14,	LT_GENERIC      = 1 << 14,
81	LT_UNKNOWN    = 1 << 15,	LT_ECHO    = 1 << 16,
82		LT_MENUENTRY    = 1 << 17,
83		LT_ENTRY_END    = 1 << 18,
84		LT_SET_VARIABLE = 1 << 19,
85		LT_UNKNOWN      = 1 << 20,
86	};	};
87
88	struct singleLine {	struct singleLine {
#	Line 99  struct singleEntry {	Line 110  struct singleEntry {
110	#define NEED_TITLE   (1 << 2)	#define NEED_TITLE   (1 << 2)
111	#define NEED_ARGS    (1 << 3)	#define NEED_ARGS    (1 << 3)
112	#define NEED_MB      (1 << 4)	#define NEED_MB      (1 << 4)
113		#define NEED_END     (1 << 5)
114
115	#define MAIN_DEFAULT    (1 << 0)	#define MAIN_DEFAULT    (1 << 0)
116	#define DEFAULT_SAVED       -2	#define DEFAULT_SAVED       -2
117		#define DEFAULT_SAVED_GRUB2 -3
118
119	struct keywordTypes {	struct keywordTypes {
120	char * key;	char * key;
#	Line 110  struct keywordTypes {	Line 123  struct keywordTypes {
123	char separatorChar;	char separatorChar;
124	};	};
125
126		struct configFileInfo;
127
128		typedef const char *(*findConfigFunc)(struct configFileInfo *);
129		typedef const int (*writeLineFunc)(struct configFileInfo *,
130		struct singleLine *line);
131
132	struct configFileInfo {	struct configFileInfo {
133	char * defaultConfig;	char * defaultConfig;
134		findConfigFunc findConfig;
135		writeLineFunc writeLine;
136	struct keywordTypes * keywords;	struct keywordTypes * keywords;
137	int defaultIsIndex;	int defaultIsIndex;
138		int defaultIsVariable;
139	int defaultSupportSaved;	int defaultSupportSaved;
140	enum lineType_e entrySeparator;	enum lineType_e entryStart;
141		enum lineType_e entryEnd;
142	int needsBootPrefix;	int needsBootPrefix;
143	int argsInQuotes;	int argsInQuotes;
144	int maxTitleLength;	int maxTitleLength;
145	int titleBracketed;	int titleBracketed;
146		int titlePosition;
147	int mbHyperFirst;	int mbHyperFirst;
148	int mbInitRdIsModule;	int mbInitRdIsModule;
149	int mbConcatArgs;	int mbConcatArgs;
#	Line 138  struct keywordTypes grubKeywords[] = {	Line 162  struct keywordTypes grubKeywords[] = {
162	{ NULL,    0, 0 },	{ NULL,    0, 0 },
163	};	};
164
165		const char *grubFindConfig(struct configFileInfo *cfi) {
166		static const char *configFiles[] = {
167		"/boot/grub/grub.conf",
168		"/boot/grub/menu.lst",
169		"/etc/grub.conf",
170		NULL
171		};
172		static int i = -1;
173
174		if (i == -1) {
175		for (i = 0; configFiles[i] != NULL; i++) {
176		dbgPrintf("Checking \"%s\": ", configFiles[i]);
177		if (!access(configFiles[i], R_OK)) {
178		dbgPrintf("found\n");
179		return configFiles[i];
180		}
181		dbgPrintf("not found\n");
182		}
183		}
184		return configFiles[i];
185		}
186
187	struct configFileInfo grubConfigType = {	struct configFileInfo grubConfigType = {
188	"/boot/grub/grub.conf",    /* defaultConfig */	.findConfig = grubFindConfig,
189	grubKeywords,    /* keywords */	.keywords = grubKeywords,
190	1,    /* defaultIsIndex */	.defaultIsIndex = 1,
191	1,    /* defaultSupportSaved */	.defaultSupportSaved = 1,
192	LT_TITLE,    /* entrySeparator */	.entryStart = LT_TITLE,
193	1,    /* needsBootPrefix */	.needsBootPrefix = 1,
194	0,    /* argsInQuotes */	.mbHyperFirst = 1,
195	0,    /* maxTitleLength */	.mbInitRdIsModule = 1,
196	0,                                      /* titleBracketed */	.mbAllowExtraInitRds = 1,
197	1,                                      /* mbHyperFirst */	};
198	1,                                      /* mbInitRdIsModule */
199	0,                                      /* mbConcatArgs */	struct keywordTypes grub2Keywords[] = {
200	1,                                      /* mbAllowExtraInitRds */	{ "menuentry",  LT_MENUENTRY,   ' ' },
201		{ "}",          LT_ENTRY_END,   ' ' },
202		{ "echo",       LT_ECHO,        ' ' },
203		{ "set",        LT_SET_VARIABLE,' ', '=' },
204		{ "root",       LT_BOOTROOT,    ' ' },
205		{ "default",    LT_DEFAULT,     ' ' },
206		{ "fallback",   LT_FALLBACK,    ' ' },
207		{ "linux",      LT_KERNEL,      ' ' },
208		{ "initrd",     LT_INITRD,      ' ', ' ' },
209		{ "module",     LT_MBMODULE,    ' ' },
210		{ "kernel",     LT_HYPER,       ' ' },
211		{ NULL, 0, 0 },
212		};
213
214		const char *grub2FindConfig(struct configFileInfo *cfi) {
215		static const char *configFiles[] = {
216		"/boot/grub/grub-efi.cfg",
217		"/boot/grub/grub.cfg",
218		NULL
219		};
220		static int i = -1;
221		static const char *grub_cfg = "/boot/grub/grub.cfg";
222
223		if (i == -1) {
224		for (i = 0; configFiles[i] != NULL; i++) {
225		dbgPrintf("Checking \"%s\": ", configFiles[i]);
226		if (!access(configFiles[i], R_OK)) {
227		dbgPrintf("found\n");
228		return configFiles[i];
229		}
230		}
231		}
232
233		/* Ubuntu renames grub2 to grub, so check for the grub.d directory
234		* that isn't in grub1, and if it exists, return the config file path
235		* that they use. */
236		if (configFiles[i] == NULL && !access("/etc/grub.d/", R_OK)) {
237		dbgPrintf("found\n");
238		return grub_cfg;
239		}
240
241		dbgPrintf("not found\n");
242		return configFiles[i];
243		}
244
245		int sizeOfSingleLine(struct singleLine * line) {
246		int count = 0;
247
248		for (int i = 0; i < line->numElements; i++) {
249		int indentSize = 0;
250
251		count = count + strlen(line->elements[i].item);
252
253		indentSize = strlen(line->elements[i].indent);
254		if (indentSize > 0)
255		count = count + indentSize;
256		else
257		/* be extra safe and add room for whitespaces */
258		count = count + 1;
259		}
260
261		/* room for trailing terminator */
262		count = count + 1;
263
264		return count;
265		}
266
267		static int isquote(char q)
268		{
269		if (q == '\'' || q == '\"')
270		return 1;
271		return 0;
272		}
273
274		char *grub2ExtractTitle(struct singleLine * line) {
275		char * current;
276		char * current_indent;
277		int current_len;
278		int current_indent_len;
279		int i;
280
281		/* bail out if line does not start with menuentry */
282		if (strcmp(line->elements[0].item, "menuentry"))
283		return NULL;
284
285		i = 1;
286		current = line->elements[i].item;
287		current_len = strlen(current);
288
289		/* if second word is quoted, strip the quotes and return single word */
290		if (isquote(*current) && isquote(current[current_len - 1])) {
291		char *tmp;
292
293		tmp = strdup(current);
294		*(tmp + current_len - 1) = '\0';
295		return ++tmp;
296		}
297
298		/* if no quotes, return second word verbatim */
299		if (!isquote(*current))
300		return current;
301
302		/* second element start with a quote, so we have to find the element
303		* whose last character is also quote (assuming it's the closing one) */
304		int resultMaxSize;
305		char * result;
306
307		resultMaxSize = sizeOfSingleLine(line);
308		result = malloc(resultMaxSize);
309		snprintf(result, resultMaxSize, "%s", ++current);
310
311		i++;
312		for (; i < line->numElements; ++i) {
313		current = line->elements[i].item;
314		current_len = strlen(current);
315		current_indent = line->elements[i].indent;
316		current_indent_len = strlen(current_indent);
317
318		strncat(result, current_indent, current_indent_len);
319		if (!isquote(current[current_len-1])) {
320		strncat(result, current, current_len);
321		} else {
322		strncat(result, current, current_len - 1);
323		break;
324		}
325		}
326		return result;
327		}
328
329		struct configFileInfo grub2ConfigType = {
330		.findConfig = grub2FindConfig,
331		.keywords = grub2Keywords,
332		.defaultIsIndex = 1,
333		.defaultSupportSaved = 1,
334		.defaultIsVariable = 1,
335		.entryStart = LT_MENUENTRY,
336		.entryEnd = LT_ENTRY_END,
337		.titlePosition = 1,
338		.needsBootPrefix = 1,
339		.mbHyperFirst = 1,
340		.mbInitRdIsModule = 1,
341		.mbAllowExtraInitRds = 1,
342	};	};
343
344	struct keywordTypes yabootKeywords[] = {	struct keywordTypes yabootKeywords[] = {
#	Line 249  struct keywordTypes extlinuxKeywords[] =	Line 436  struct keywordTypes extlinuxKeywords[] =
436	};	};
437	int useextlinuxmenu;	int useextlinuxmenu;
438	struct configFileInfo eliloConfigType = {	struct configFileInfo eliloConfigType = {
439	"/boot/efi/EFI/redhat/elilo.conf",    /* defaultConfig */	.defaultConfig = "/boot/efi/EFI/redhat/elilo.conf",
440	eliloKeywords,    /* keywords */	.keywords = eliloKeywords,
441	0,    /* defaultIsIndex */	.entryStart = LT_KERNEL,
442	0,    /* defaultSupportSaved */	.needsBootPrefix = 1,
443	LT_KERNEL,    /* entrySeparator */	.argsInQuotes = 1,
444	1,                    /* needsBootPrefix */	.mbConcatArgs = 1,
	1,    /* argsInQuotes */
	0,    /* maxTitleLength */
	0,                                      /* titleBracketed */
	0,                                      /* mbHyperFirst */
	0,                                      /* mbInitRdIsModule */
	1,                                      /* mbConcatArgs */
	0,                                      /* mbAllowExtraInitRds */
445	};	};
446
447	struct configFileInfo liloConfigType = {	struct configFileInfo liloConfigType = {
448	"/etc/lilo.conf",    /* defaultConfig */	.defaultConfig = "/etc/lilo.conf",
449	liloKeywords,    /* keywords */	.keywords = liloKeywords,
450	0,    /* defaultIsIndex */	.entryStart = LT_KERNEL,
451	0,    /* defaultSupportSaved */	.argsInQuotes = 1,
452	LT_KERNEL,    /* entrySeparator */	.maxTitleLength = 15,
	0,    /* needsBootPrefix */
	1,    /* argsInQuotes */
	15,    /* maxTitleLength */
	0,                                      /* titleBracketed */
	0,                                      /* mbHyperFirst */
	0,                                      /* mbInitRdIsModule */
	0,                                      /* mbConcatArgs */
	0,                                      /* mbAllowExtraInitRds */
453	};	};
454
455	struct configFileInfo yabootConfigType = {	struct configFileInfo yabootConfigType = {
456	"/etc/yaboot.conf",    /* defaultConfig */	.defaultConfig = "/etc/yaboot.conf",
457	yabootKeywords,    /* keywords */	.keywords = yabootKeywords,
458	0,    /* defaultIsIndex */	.entryStart = LT_KERNEL,
459	0,    /* defaultSupportSaved */	.needsBootPrefix = 1,
460	LT_KERNEL,    /* entrySeparator */	.argsInQuotes = 1,
461	1,    /* needsBootPrefix */	.maxTitleLength = 15,
462	1,    /* argsInQuotes */	.mbAllowExtraInitRds = 1,
	15,    /* maxTitleLength */
	0,                                      /* titleBracketed */
	0,                                      /* mbHyperFirst */
	0,                                      /* mbInitRdIsModule */
	0,                                      /* mbConcatArgs */
	1,                                      /* mbAllowExtraInitRds */
463	};	};
464
465	struct configFileInfo siloConfigType = {	struct configFileInfo siloConfigType = {
466	"/etc/silo.conf",    /* defaultConfig */	.defaultConfig = "/etc/silo.conf",
467	siloKeywords,    /* keywords */	.keywords = siloKeywords,
468	0,    /* defaultIsIndex */	.entryStart = LT_KERNEL,
469	0,    /* defaultSupportSaved */	.needsBootPrefix = 1,
470	LT_KERNEL,    /* entrySeparator */	.argsInQuotes = 1,
471	1,    /* needsBootPrefix */	.maxTitleLength = 15,
	1,    /* argsInQuotes */
	15,    /* maxTitleLength */
	0,                                      /* titleBracketed */
	0,                                      /* mbHyperFirst */
	0,                                      /* mbInitRdIsModule */
	0,                                      /* mbConcatArgs */
	0,                                      /* mbAllowExtraInitRds */
472	};	};
473
474	struct configFileInfo ziplConfigType = {	struct configFileInfo ziplConfigType = {
475	"/etc/zipl.conf",    /* defaultConfig */	.defaultConfig = "/etc/zipl.conf",
476	ziplKeywords,    /* keywords */	.keywords = ziplKeywords,
477	0,    /* defaultIsIndex */	.entryStart = LT_TITLE,
478	0,    /* defaultSupportSaved */	.argsInQuotes = 1,
479	LT_TITLE,    /* entrySeparator */	.titleBracketed = 1,
	0,    /* needsBootPrefix */
	1,    /* argsInQuotes */
	0,    /* maxTitleLength */
	1,                                      /* titleBracketed */
	0,                                      /* mbHyperFirst */
	0,                                      /* mbInitRdIsModule */
	0,                                      /* mbConcatArgs */
	0,                                      /* mbAllowExtraInitRds */
480	};	};
481
482	struct configFileInfo extlinuxConfigType = {	struct configFileInfo extlinuxConfigType = {
483	"/boot/extlinux/extlinux.conf",         /* defaultConfig */	.defaultConfig = "/boot/extlinux/extlinux.conf",
484	extlinuxKeywords,                       /* keywords */	.keywords = extlinuxKeywords,
485	0,                                      /* defaultIsIndex */	.entryStart = LT_TITLE,
486	0,                                      /* defaultSupportSaved */	.needsBootPrefix = 1,
487	LT_TITLE,                               /* entrySeparator */	.maxTitleLength = 255,
488	1,                                      /* needsBootPrefix */	.mbAllowExtraInitRds = 1,
	0,                                      /* argsInQuotes */
	255,                                    /* maxTitleLength */
	0,                                      /* titleBracketed */
	0,                                      /* mbHyperFirst */
	0,                                      /* mbInitRdIsModule */
	0,                                      /* mbConcatArgs */
	1,                                      /* mbAllowExtraInitRds */
489	};	};
490
491	struct grubConfig {	struct grubConfig {
#	Line 371  static int lineWrite(FILE * out, struct	Line 515  static int lineWrite(FILE * out, struct
515	static int getNextLine(char ** bufPtr, struct singleLine * line,	static int getNextLine(char ** bufPtr, struct singleLine * line,
516	struct configFileInfo * cfi);	struct configFileInfo * cfi);
517	static char * getRootSpecifier(char * str);	static char * getRootSpecifier(char * str);
518		static void requote(struct singleLine *line, struct configFileInfo * cfi);
519	static void insertElement(struct singleLine * line,	static void insertElement(struct singleLine * line,
520	const char * item, int insertHere,	const char * item, int insertHere,
521	struct configFileInfo * cfi);	struct configFileInfo * cfi);
#	Line 427  static char * sdupprintf(const char *for	Line 572  static char * sdupprintf(const char *for
572
573	static struct keywordTypes * getKeywordByType(enum lineType_e type,	static struct keywordTypes * getKeywordByType(enum lineType_e type,
574	struct configFileInfo * cfi) {	struct configFileInfo * cfi) {
575	struct keywordTypes * kw;	for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
	for (kw = cfi->keywords; kw->key; kw++) {
576	if (kw->type == type)	if (kw->type == type)
577	return kw;	return kw;
578	}	}
579	return NULL;	return NULL;
580	}	}
581
582		static char *getKeyByType(enum lineType_e type, struct configFileInfo * cfi) {
583		struct keywordTypes *kt = getKeywordByType(type, cfi);
584		if (kt)
585		return kt->key;
586		return "unknown";
587		}
588
589	static char * getpathbyspec(char *device) {	static char * getpathbyspec(char *device) {
590	if (!blkid)	if (!blkid)
591	blkid_get_cache(&blkid, NULL);	blkid_get_cache(&blkid, NULL);
#	Line 451  static char * getuuidbydev(char *device)	Line 602  static char * getuuidbydev(char *device)
602
603	static enum lineType_e getTypeByKeyword(char * keyword,	static enum lineType_e getTypeByKeyword(char * keyword,
604	struct configFileInfo * cfi) {	struct configFileInfo * cfi) {
605	struct keywordTypes * kw;	for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
	for (kw = cfi->keywords; kw->key; kw++) {
606	if (!strcmp(keyword, kw->key))	if (!strcmp(keyword, kw->key))
607	return kw->type;	return kw->type;
608	}	}
#	Line 484  static int isBracketedTitle(struct singl	Line 634  static int isBracketedTitle(struct singl
634	return 0;	return 0;
635	}	}
636
637	static int isEntrySeparator(struct singleLine * line,	static int isEntryStart(struct singleLine * line,
638	struct configFileInfo * cfi) {	struct configFileInfo * cfi) {
639	return line->type == cfi->entrySeparator || line->type == LT_OTHER ||	return line->type == cfi->entryStart || line->type == LT_OTHER ||
640	(cfi->titleBracketed && isBracketedTitle(line));	(cfi->titleBracketed && isBracketedTitle(line));
641	}	}
642
#	Line 539  static void lineInit(struct singleLine *	Line 689  static void lineInit(struct singleLine *
689	}	}
690
691	struct singleLine * lineDup(struct singleLine * line) {	struct singleLine * lineDup(struct singleLine * line) {
	int i;
692	struct singleLine * newLine = malloc(sizeof(*newLine));	struct singleLine * newLine = malloc(sizeof(*newLine));
693
694	newLine->indent = strdup(line->indent);	newLine->indent = strdup(line->indent);
#	Line 549  struct singleLine * lineDup(struct singl	Line 698  struct singleLine * lineDup(struct singl
698	newLine->elements = malloc(sizeof(*newLine->elements) *	newLine->elements = malloc(sizeof(*newLine->elements) *
699	newLine->numElements);	newLine->numElements);
700
701	for (i = 0; i < newLine->numElements; i++) {	for (int i = 0; i < newLine->numElements; i++) {
702	newLine->elements[i].indent = strdup(line->elements[i].indent);	newLine->elements[i].indent = strdup(line->elements[i].indent);
703	newLine->elements[i].item = strdup(line->elements[i].item);	newLine->elements[i].item = strdup(line->elements[i].item);
704	}	}
#	Line 558  struct singleLine * lineDup(struct singl	Line 707  struct singleLine * lineDup(struct singl
707	}	}
708
709	static void lineFree(struct singleLine * line) {	static void lineFree(struct singleLine * line) {
	int i;
710	if (line->indent) free(line->indent);	if (line->indent) free(line->indent);
711
712	for (i = 0; i < line->numElements; i++) {	for (int i = 0; i < line->numElements; i++) {
713	free(line->elements[i].item);	free(line->elements[i].item);
714	free(line->elements[i].indent);	free(line->elements[i].indent);
715	}	}
#	Line 573  static void lineFree(struct singleLine *	Line 720  static void lineFree(struct singleLine *
720
721	static int lineWrite(FILE * out, struct singleLine * line,	static int lineWrite(FILE * out, struct singleLine * line,
722	struct configFileInfo * cfi) {	struct configFileInfo * cfi) {
	int i;
723	if (fprintf(out, "%s", line->indent) == -1) return -1;	if (fprintf(out, "%s", line->indent) == -1) return -1;
724
725	for (i = 0; i < line->numElements; i++) {	for (int i = 0; i < line->numElements; i++) {
726		/* Need to handle this, because we strip the quotes from
727		* menuentry when read it. */
728		if (line->type == LT_MENUENTRY && i == 1) {
729		if(!isquote(*line->elements[i].item))
730		fprintf(out, "\'%s\'", line->elements[i].item);
731		else
732		fprintf(out, "%s", line->elements[i].item);
733		fprintf(out, "%s", line->elements[i].indent);
734
735		continue;
736		}
737
738	if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)	if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)
739	if (fputc('"', out) == EOF) return -1;	if (fputc('"', out) == EOF) return -1;
740
#	Line 671  static int getNextLine(char ** bufPtr, s	Line 828  static int getNextLine(char ** bufPtr, s
828	if (*line->elements[0].item == '#') {	if (*line->elements[0].item == '#') {
829	char * fullLine;	char * fullLine;
830	int len;	int len;
	int i;
831
832	len = strlen(line->indent);	len = strlen(line->indent);
833	for (i = 0; i < line->numElements; i++)	for (int i = 0; i < line->numElements; i++)
834	len += strlen(line->elements[i].item) +	len += strlen(line->elements[i].item) +
835	strlen(line->elements[i].indent);	strlen(line->elements[i].indent);
836
#	Line 683  static int getNextLine(char ** bufPtr, s	Line 839  static int getNextLine(char ** bufPtr, s
839	free(line->indent);	free(line->indent);
840	line->indent = fullLine;	line->indent = fullLine;
841
842	for (i = 0; i < line->numElements; i++) {	for (int i = 0; i < line->numElements; i++) {
843	strcat(fullLine, line->elements[i].item);	strcat(fullLine, line->elements[i].item);
844	strcat(fullLine, line->elements[i].indent);	strcat(fullLine, line->elements[i].indent);
845	free(line->elements[i].item);	free(line->elements[i].item);
#	Line 702  static int getNextLine(char ** bufPtr, s	Line 858  static int getNextLine(char ** bufPtr, s
858	* elements up more	* elements up more
859	*/	*/
860	if (!isspace(kw->separatorChar)) {	if (!isspace(kw->separatorChar)) {
	int i;
861	char indent[2] = "";	char indent[2] = "";
862	indent[0] = kw->separatorChar;	indent[0] = kw->separatorChar;
863	for (i = 1; i < line->numElements; i++) {	for (int i = 1; i < line->numElements; i++) {
864	char *p;	char *p;
	int j;
865	int numNewElements;	int numNewElements;
866
867	numNewElements = 0;	numNewElements = 0;
#	Line 723  static int getNextLine(char ** bufPtr, s	Line 877  static int getNextLine(char ** bufPtr, s
877	sizeof(*line->elements) * elementsAlloced);	sizeof(*line->elements) * elementsAlloced);
878	}	}
879
880	for (j = line->numElements; j > i; j--) {	for (int j = line->numElements; j > i; j--) {
881	line->elements[j + numNewElements] = line->elements[j];	line->elements[j + numNewElements] = line->elements[j];
882	}	}
883	line->numElements += numNewElements;	line->numElements += numNewElements;
#	Line 736  static int getNextLine(char ** bufPtr, s	Line 890  static int getNextLine(char ** bufPtr, s
890	break;	break;
891	}	}
892
893	free(line->elements[i].indent);	line->elements[i + 1].indent = line->elements[i].indent;
894	line->elements[i].indent = strdup(indent);	line->elements[i].indent = strdup(indent);
895	*p++ = '\0';	*p++ = '\0';
896	i++;	i++;
897	line->elements[i].item = strdup(p);	line->elements[i].item = strdup(p);
	line->elements[i].indent = strdup("");
	p = line->elements[i].item;
898	}	}
899	}	}
900	}	}
#	Line 763  static struct grubConfig * readConfig(co	Line 915  static struct grubConfig * readConfig(co
915	struct singleLine * last = NULL, * line, * defaultLine = NULL;	struct singleLine * last = NULL, * line, * defaultLine = NULL;
916	char * end;	char * end;
917	struct singleEntry * entry = NULL;	struct singleEntry * entry = NULL;
918	int i, len;	int len;
919	char * buf;	char * buf;
920
921	if (!strcmp(inName, "-")) {	if (!strcmp(inName, "-")) {
#	Line 809  static struct grubConfig * readConfig(co	Line 961  static struct grubConfig * readConfig(co
961	cfg->secondaryIndent = strdup(line->indent);	cfg->secondaryIndent = strdup(line->indent);
962	}	}
963
964	if (isEntrySeparator(line, cfi)) {	if (isEntryStart(line, cfi) || (cfg->entries && !sawEntry)) {
965	sawEntry = 1;	sawEntry = 1;
966	if (!entry) {	if (!entry) {
967	cfg->entries = malloc(sizeof(*entry));	cfg->entries = malloc(sizeof(*entry));
#	Line 825  static struct grubConfig * readConfig(co	Line 977  static struct grubConfig * readConfig(co
977	entry->next = NULL;	entry->next = NULL;
978	}	}
979
980	if (line->type == LT_DEFAULT && line->numElements == 2) {	if (line->type == LT_SET_VARIABLE) {
981		dbgPrintf("found 'set' command (%d elements): ", line->numElements);
982		dbgPrintf("%s", line->indent);
983		for (int i = 0; i < line->numElements; i++)
984		dbgPrintf("\"%s\"%s", line->elements[i].item, line->elements[i].indent);
985		dbgPrintf("\n");
986		struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
987		if (kwType && line->numElements == 3 &&
988		!strcmp(line->elements[1].item, kwType->key)) {
989		dbgPrintf("Line sets default config\n");
990		cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
991		defaultLine = line;
992		}
993		} else if (line->type == LT_DEFAULT && line->numElements == 2) {
994	cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;	cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
995	defaultLine = line;	defaultLine = line;
996
#	Line 843  static struct grubConfig * readConfig(co	Line 1008  static struct grubConfig * readConfig(co
1008	* This only applies to grub, but that's the only place we	* This only applies to grub, but that's the only place we
1009	* should find LT_MBMODULE lines anyway.	* should find LT_MBMODULE lines anyway.
1010	*/	*/
1011	struct singleLine * l;	for (struct singleLine *l = entry->lines; l; l = l->next) {
	for (l = entry->lines; l; l = l->next) {
1012	if (l->type == LT_HYPER)	if (l->type == LT_HYPER)
1013	break;	break;
1014	else if (l->type == LT_KERNEL) {	else if (l->type == LT_KERNEL) {
#	Line 864  static struct grubConfig * readConfig(co	Line 1028  static struct grubConfig * readConfig(co
1028	} else if (line->type == LT_TITLE && line->numElements > 1) {	} else if (line->type == LT_TITLE && line->numElements > 1) {
1029	/* make the title a single argument (undoing our parsing) */	/* make the title a single argument (undoing our parsing) */
1030	len = 0;	len = 0;
1031	for (i = 1; i < line->numElements; i++) {	for (int i = 1; i < line->numElements; i++) {
1032	len += strlen(line->elements[i].item);	len += strlen(line->elements[i].item);
1033	len += strlen(line->elements[i].indent);	len += strlen(line->elements[i].indent);
1034	}	}
1035	buf = malloc(len + 1);	buf = malloc(len + 1);
1036	*buf = '\0';	*buf = '\0';
1037
1038	for (i = 1; i < line->numElements; i++) {	for (int i = 1; i < line->numElements; i++) {
1039	strcat(buf, line->elements[i].item);	strcat(buf, line->elements[i].item);
1040	free(line->elements[i].item);	free(line->elements[i].item);
1041
#	Line 885  static struct grubConfig * readConfig(co	Line 1049  static struct grubConfig * readConfig(co
1049	line->elements[line->numElements - 1].indent;	line->elements[line->numElements - 1].indent;
1050	line->elements[1].item = buf;	line->elements[1].item = buf;
1051	line->numElements = 2;	line->numElements = 2;
1052		} else if (line->type == LT_MENUENTRY && line->numElements > 3) {
1053		/* let --remove-kernel="TITLE=what" work */
1054		len = 0;
1055		char *extras;
1056		char *title;
1057
1058		for (int i = 1; i < line->numElements; i++) {
1059		len += strlen(line->elements[i].item);
1060		len += strlen(line->elements[i].indent);
1061		}
1062		buf = malloc(len + 1);
1063		*buf = '\0';
1064
1065		/* allocate mem for extra flags. */
1066		extras = malloc(len + 1);
1067		*extras = '\0';
1068
1069		/* get title. */
1070		for (int i = 0; i < line->numElements; i++) {
1071		if (!strcmp(line->elements[i].item, "menuentry"))
1072		continue;
1073		if (isquote(*line->elements[i].item))
1074		title = line->elements[i].item + 1;
1075		else
1076		title = line->elements[i].item;
1077
1078		len = strlen(title);
1079		if (isquote(title[len-1])) {
1080		strncat(buf, title,len-1);
1081		break;
1082		} else {
1083		strcat(buf, title);
1084		strcat(buf, line->elements[i].indent);
1085		}
1086		}
1087
1088		/* get extras */
1089		int count = 0;
1090		for (int i = 0; i < line->numElements; i++) {
1091		if (count >= 2) {
1092		strcat(extras, line->elements[i].item);
1093		strcat(extras, line->elements[i].indent);
1094		}
1095
1096		if (!strcmp(line->elements[i].item, "menuentry"))
1097		continue;
1098
1099		/* count ' or ", there should be two in menuentry line. */
1100		if (isquote(*line->elements[i].item))
1101		count++;
1102
1103		len = strlen(line->elements[i].item);
1104
1105		if (isquote(line->elements[i].item[len -1]))
1106		count++;
1107
1108		/* ok, we get the final ' or ", others are extras. */
1109		}
1110		line->elements[1].indent =
1111		line->elements[line->numElements - 2].indent;
1112		line->elements[1].item = buf;
1113		line->elements[2].indent =
1114		line->elements[line->numElements - 2].indent;
1115		line->elements[2].item = extras;
1116		line->numElements = 3;
1117	} else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {	} else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {
1118	/* Strip off any " which may be present; they'll be put back	/* Strip off any " which may be present; they'll be put back
1119	on write. This is one of the few (the only?) places that grubby	on write. This is one of the few (the only?) places that grubby
#	Line 894  static struct grubConfig * readConfig(co	Line 1122  static struct grubConfig * readConfig(co
1122	if (line->numElements >= 2) {	if (line->numElements >= 2) {
1123	int last, len;	int last, len;
1124
1125	if (*line->elements[1].item == '"')	if (isquote(*line->elements[1].item))
1126	memmove(line->elements[1].item, line->elements[1].item + 1,	memmove(line->elements[1].item, line->elements[1].item + 1,
1127	strlen(line->elements[1].item + 1) + 1);	strlen(line->elements[1].item + 1) + 1);
1128
1129	last = line->numElements - 1;	last = line->numElements - 1;
1130	len = strlen(line->elements[last].item) - 1;	len = strlen(line->elements[last].item) - 1;
1131	if (line->elements[last].item[len] == '"')	if (isquote(line->elements[last].item[len]))
1132	line->elements[last].item[len] = '\0';	line->elements[last].item[len] = '\0';
1133	}	}
1134	}	}
#	Line 938  static struct grubConfig * readConfig(co	Line 1166  static struct grubConfig * readConfig(co
1166	entry->lines = line;	entry->lines = line;
1167	else	else
1168	last->next = line;	last->next = line;
1169	dbgPrintf("readConfig added %d to %p\n", line->type, entry);	dbgPrintf("readConfig added %s to %p\n", getKeyByType(line->type, cfi), entry);
1170
1171		/* we could have seen this outside of an entry... if so, we
1172		* ignore it like any other line we don't grok */
1173		if (line->type == LT_ENTRY_END && sawEntry)
1174		sawEntry = 0;
1175	} else {	} else {
1176	if (!cfg->theLines)	if (!cfg->theLines)
1177	cfg->theLines = line;	cfg->theLines = line;
1178	else	else
1179	last->next = line;	last->next = line;
1180	dbgPrintf("readConfig added %d to cfg\n", line->type);	dbgPrintf("readConfig added %s to cfg\n", getKeyByType(line->type, cfi));
1181	}	}
1182
1183	last = line;	last = line;
#	Line 952  static struct grubConfig * readConfig(co	Line 1185  static struct grubConfig * readConfig(co
1185
1186	free(incoming);	free(incoming);
1187
1188		dbgPrintf("defaultLine is %s\n", defaultLine ? "set" : "unset");
1189	if (defaultLine) {	if (defaultLine) {
1190	if (cfi->defaultSupportSaved &&	if (defaultLine->numElements > 2 &&
1191		cfi->defaultSupportSaved &&
1192		!strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {
1193		cfg->defaultImage = DEFAULT_SAVED_GRUB2;
1194		} else if (cfi->defaultIsVariable) {
1195		char *value = defaultLine->elements[2].item;
1196		while (*value && (*value == '"' || *value == '\'' ||
1197		*value == ' ' || *value == '\t'))
1198		value++;
1199		cfg->defaultImage = strtol(value, &end, 10);
1200		while (*end && (*end == '"' || *end == '\'' ||
1201		*end == ' ' || *end == '\t'))
1202		end++;
1203		if (*end) cfg->defaultImage = -1;
1204		} else if (cfi->defaultSupportSaved &&
1205	!strncmp(defaultLine->elements[1].item, "saved", 5)) {	!strncmp(defaultLine->elements[1].item, "saved", 5)) {
1206	cfg->defaultImage = DEFAULT_SAVED;	cfg->defaultImage = DEFAULT_SAVED;
1207	} else if (cfi->defaultIsIndex) {	} else if (cfi->defaultIsIndex) {
1208	cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);	cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);
1209	if (*end) cfg->defaultImage = -1;	if (*end) cfg->defaultImage = -1;
1210	} else if (defaultLine->numElements >= 2) {	} else if (defaultLine->numElements >= 2) {
1211	i = 0;	int i = 0;
1212	while ((entry = findEntryByIndex(cfg, i))) {	while ((entry = findEntryByIndex(cfg, i))) {
1213	for (line = entry->lines; line; line = line->next)	for (line = entry->lines; line; line = line->next)
1214	if (line->type == LT_TITLE) break;	if (line->type == LT_TITLE) break;
#	Line 1000  static void writeDefault(FILE * out, cha	Line 1248  static void writeDefault(FILE * out, cha
1248
1249	if (cfg->defaultImage == DEFAULT_SAVED)	if (cfg->defaultImage == DEFAULT_SAVED)
1250	fprintf(out, "%sdefault%ssaved\n", indent, separator);	fprintf(out, "%sdefault%ssaved\n", indent, separator);
1251		else if (cfg->defaultImage == DEFAULT_SAVED_GRUB2)
1252		fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
1253	else if (cfg->defaultImage > -1) {	else if (cfg->defaultImage > -1) {
1254	if (cfg->cfi->defaultIsIndex) {	if (cfg->cfi->defaultIsIndex) {
1255	fprintf(out, "%sdefault%s%d\n", indent, separator,	if (cfg->cfi->defaultIsVariable) {
1256	cfg->defaultImage);	fprintf(out, "%sset default=\"%d\"\n", indent,
1257		cfg->defaultImage);
1258		} else {
1259		fprintf(out, "%sdefault%s%d\n", indent, separator,
1260		cfg->defaultImage);
1261		}
1262	} else {	} else {
1263	int image = cfg->defaultImage;	int image = cfg->defaultImage;
1264
#	Line 1055  static int writeConfig(struct grubConfig	Line 1310  static int writeConfig(struct grubConfig
1310
1311	/* most likely the symlink is relative, so change our	/* most likely the symlink is relative, so change our
1312	directory to the dir of the symlink */	directory to the dir of the symlink */
1313	rc = chdir(dirname(strdupa(outName)));	rc = chdir(dirname(outName));
1314	do {	do {
1315	buf = alloca(len + 1);	buf = alloca(len + 1);
1316	rc = readlink(basename(outName), buf, len);	rc = readlink(basename(outName), buf, len);
#	Line 1093  static int writeConfig(struct grubConfig	Line 1348  static int writeConfig(struct grubConfig
1348	}	}
1349
1350	line = cfg->theLines;	line = cfg->theLines;
1351		struct keywordTypes *defaultKw = getKeywordByType(LT_DEFAULT, cfg->cfi);
1352	while (line) {	while (line) {
1353	if (line->type == LT_DEFAULT) {	if (line->type == LT_SET_VARIABLE && defaultKw &&
1354		line->numElements == 3 &&
1355		!strcmp(line->elements[1].item, defaultKw->key)) {
1356		writeDefault(out, line->indent, line->elements[0].indent, cfg);
1357		needs &= ~MAIN_DEFAULT;
1358		} else if (line->type == LT_DEFAULT) {
1359	writeDefault(out, line->indent, line->elements[0].indent, cfg);	writeDefault(out, line->indent, line->elements[0].indent, cfg);
1360	needs &= ~MAIN_DEFAULT;	needs &= ~MAIN_DEFAULT;
1361	} else if (line->type == LT_FALLBACK) {	} else if (line->type == LT_FALLBACK) {
#	Line 1187  static char *findDiskForRoot()	Line 1448  static char *findDiskForRoot()
1448	buf[rc] = '\0';	buf[rc] = '\0';
1449	chptr = buf;	chptr = buf;
1450
1451		char *foundanswer = NULL;
1452
1453	while (chptr && chptr != buf+rc) {	while (chptr && chptr != buf+rc) {
1454	devname = chptr;	devname = chptr;
1455
#	Line 1214  static char *findDiskForRoot()	Line 1477  static char *findDiskForRoot()
1477	* for '/' obviously.	* for '/' obviously.
1478	*/	*/
1479	if (*(++chptr) == '/' && *(++chptr) == ' ') {	if (*(++chptr) == '/' && *(++chptr) == ' ') {
1480	/*	/* remember the last / entry in mtab */
1481	* Move back 2, which is the first space after the device name, set	foundanswer = devname;
	* it to \0 so strdup will just get the devicename.
	*/
	chptr -= 2;
	*chptr = '\0';
	return strdup(devname);
1482	}	}
1483
1484	/* Next line */	/* Next line */
#	Line 1229  static char *findDiskForRoot()	Line 1487  static char *findDiskForRoot()
1487	chptr++;	chptr++;
1488	}	}
1489
1490		/* Return the last / entry found */
1491		if (foundanswer) {
1492		chptr = strchr(foundanswer, ' ');
1493		*chptr = '\0';
1494		return strdup(foundanswer);
1495		}
1496
1497	return NULL;	return NULL;
1498	}	}
1499
1500		void printEntry(struct singleEntry * entry) {
1501		int i;
1502		struct singleLine * line;
1503
1504		for (line = entry->lines; line; line = line->next) {
1505		fprintf(stderr, "DBG: %s", line->indent);
1506		for (i = 0; i < line->numElements; i++) {
1507		/* Need to handle this, because we strip the quotes from
1508		* menuentry when read it. */
1509		if (line->type == LT_MENUENTRY && i == 1) {
1510		if(!isquote(*line->elements[i].item))
1511		fprintf(stderr, "\'%s\'", line->elements[i].item);
1512		else
1513		fprintf(stderr, "%s", line->elements[i].item);
1514		fprintf(stderr, "%s", line->elements[i].indent);
1515
1516		continue;
1517		}
1518
1519		fprintf(stderr, "%s%s",
1520		line->elements[i].item, line->elements[i].indent);
1521		}
1522		fprintf(stderr, "\n");
1523		}
1524		}
1525
1526		void notSuitablePrintf(struct singleEntry * entry, const char *fmt, ...)
1527		{
1528		va_list argp;
1529
1530		if (!debug)
1531		return;
1532
1533		va_start(argp, fmt);
1534		fprintf(stderr, "DBG: Image entry failed: ");
1535		vfprintf(stderr, fmt, argp);
1536		printEntry(entry);
1537		va_end(argp);
1538		}
1539
1540		#define beginswith(s, c) ((s) && (s)[0] == (c))
1541
1542		static int endswith(const char *s, char c)
1543		{
1544		int slen;
1545
1546		if (!s || !s[0])
1547		return 0;
1548		slen = strlen(s) - 1;
1549
1550		return s[slen] == c;
1551		}
1552
1553	int suitableImage(struct singleEntry * entry, const char * bootPrefix,	int suitableImage(struct singleEntry * entry, const char * bootPrefix,
1554	int skipRemoved, int flags) {	int skipRemoved, int flags) {
1555	struct singleLine * line;	struct singleLine * line;
#	Line 1241  int suitableImage(struct singleEntry * e	Line 1559  int suitableImage(struct singleEntry * e
1559	char * rootspec;	char * rootspec;
1560	char * rootdev;	char * rootdev;
1561
1562	if (skipRemoved && entry->skip) return 0;	if (skipRemoved && entry->skip) {
1563		notSuitablePrintf(entry, "marked to skip\n");
1564		return 0;
1565		}
1566
1567	line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);	line = getLineByType(LT_KERNEL|LT_HYPER, entry->lines);
1568	if (!line || line->numElements < 2) return 0;	if (!line) {
1569		notSuitablePrintf(entry, "no line found\n");
1570		return 0;
1571		}
1572		if (line->numElements < 2) {
1573		notSuitablePrintf(entry, "line has only %d elements\n",
1574		line->numElements);
1575		return 0;
1576		}
1577
1578	if (flags & GRUBBY_BADIMAGE_OKAY) return 1;	if (flags & GRUBBY_BADIMAGE_OKAY) return 1;
1579
1580	fullName = alloca(strlen(bootPrefix) +	fullName = alloca(strlen(bootPrefix) +
1581	strlen(line->elements[1].item) + 1);	strlen(line->elements[1].item) + 1);
1582	rootspec = getRootSpecifier(line->elements[1].item);	rootspec = getRootSpecifier(line->elements[1].item);
1583	sprintf(fullName, "%s%s", bootPrefix,	int rootspec_offset = rootspec ? strlen(rootspec) : 0;
1584	line->elements[1].item + (rootspec ? strlen(rootspec) : 0));	int hasslash = endswith(bootPrefix, '/') ||
1585	if (access(fullName, R_OK)) return 0;	beginswith(line->elements[1].item + rootspec_offset, '/');
1586		sprintf(fullName, "%s%s%s", bootPrefix, hasslash ? "" : "/",
1587		line->elements[1].item + rootspec_offset);
1588		if (access(fullName, R_OK)) {
1589		notSuitablePrintf(entry, "access to %s failed\n", fullName);
1590		return 0;
1591		}
1592	for (i = 2; i < line->numElements; i++)	for (i = 2; i < line->numElements; i++)
1593	if (!strncasecmp(line->elements[i].item, "root=", 5)) break;	if (!strncasecmp(line->elements[i].item, "root=", 5)) break;
1594	if (i < line->numElements) {	if (i < line->numElements) {
#	Line 1272  int suitableImage(struct singleEntry * e	Line 1606  int suitableImage(struct singleEntry * e
1606	line = getLineByType(LT_KERNELARGS|LT_MBMODULE, entry->lines);	line = getLineByType(LT_KERNELARGS|LT_MBMODULE, entry->lines);
1607
1608	/* failed to find one */	/* failed to find one */
1609	if (!line) return 0;	if (!line) {
1610		notSuitablePrintf(entry, "no line found\n");
1611		return 0;
1612		}
1613
1614	for (i = 1; i < line->numElements; i++)	for (i = 1; i < line->numElements; i++)
1615	if (!strncasecmp(line->elements[i].item, "root=", 5)) break;	if (!strncasecmp(line->elements[i].item, "root=", 5)) break;
1616	if (i < line->numElements)	if (i < line->numElements)
1617	dev = line->elements[i].item + 5;	dev = line->elements[i].item + 5;
1618	else {	else {
1619		notSuitablePrintf(entry, "no root= entry found\n");
1620	/* it failed too...  can't find root= */	/* it failed too...  can't find root= */
1621	return 0;	return 0;
1622	}	}
#	Line 1286  int suitableImage(struct singleEntry * e	Line 1624  int suitableImage(struct singleEntry * e
1624	}	}
1625
1626	dev = getpathbyspec(dev);	dev = getpathbyspec(dev);
1627	if (!dev)	if (!getpathbyspec(dev)) {
1628		notSuitablePrintf(entry, "can't find blkid entry for %s\n", dev);
1629	return 0;	return 0;
1630		} else
1631		dev = getpathbyspec(dev);
1632
1633	rootdev = findDiskForRoot();	rootdev = findDiskForRoot();
1634	if (!rootdev)	if (!rootdev) {
1635		notSuitablePrintf(entry, "can't find root device\n");
1636	return 0;	return 0;
1637		}
1638
1639	if (!getuuidbydev(rootdev) || !getuuidbydev(dev)) {	if (!getuuidbydev(rootdev) || !getuuidbydev(dev)) {
1640		notSuitablePrintf(entry, "uuid missing: rootdev %s, dev %s\n",
1641		getuuidbydev(rootdev), getuuidbydev(dev));
1642	free(rootdev);	free(rootdev);
1643	return 0;	return 0;
1644	}	}
1645
1646	if (strcmp(getuuidbydev(rootdev), getuuidbydev(dev))) {	if (strcmp(getuuidbydev(rootdev), getuuidbydev(dev))) {
1647		notSuitablePrintf(entry, "uuid mismatch: rootdev %s, dev %s\n",
1648		getuuidbydev(rootdev), getuuidbydev(dev));
1649	free(rootdev);	free(rootdev);
1650	return 0;	return 0;
1651	}	}
#	Line 1385  struct singleEntry * findEntryByPath(str	Line 1732  struct singleEntry * findEntryByPath(str
1732
1733	if (!strncmp(kernel, "TITLE=", 6)) {	if (!strncmp(kernel, "TITLE=", 6)) {
1734	prefix = "";	prefix = "";
1735	checkType = LT_TITLE;	checkType = LT_TITLE|LT_MENUENTRY;
1736	kernel += 6;	kernel += 6;
1737	}	}
1738
#	Line 1401  struct singleEntry * findEntryByPath(str	Line 1748  struct singleEntry * findEntryByPath(str
1748	checkType, line);	checkType, line);
1749	if (!line) break;  /* not found in this entry */	if (!line) break;  /* not found in this entry */
1750
1751	if (line && line->numElements >= 2) {	if (line && line->type != LT_MENUENTRY &&
1752		line->numElements >= 2) {
1753	rootspec = getRootSpecifier(line->elements[1].item);	rootspec = getRootSpecifier(line->elements[1].item);
1754	if (!strcmp(line->elements[1].item +	if (!strcmp(line->elements[1].item +
1755	((rootspec != NULL) ? strlen(rootspec) : 0),	((rootspec != NULL) ? strlen(rootspec) : 0),
1756	kernel + strlen(prefix)))	kernel + strlen(prefix)))
1757	break;	break;
1758	}	}
1759		if(line->type == LT_MENUENTRY &&
1760		!strcmp(line->elements[1].item, kernel))
1761		break;
1762	}	}
1763
1764	/* make sure this entry has a kernel identifier; this skips	/* make sure this entry has a kernel identifier; this skips
#	Line 1499  void markRemovedImage(struct grubConfig	Line 1850  void markRemovedImage(struct grubConfig
1850	const char * prefix) {	const char * prefix) {
1851	struct singleEntry * entry;	struct singleEntry * entry;
1852
1853	if (!image) return;	if (!image)
1854		return;
1855
1856		/* check and see if we're removing the default image */
1857		if (isdigit(*image)) {
1858		entry = findEntryByPath(cfg, image, prefix, NULL);
1859		if(entry)
1860		entry->skip = 1;
1861		return;
1862		}
1863
1864	while ((entry = findEntryByPath(cfg, image, prefix, NULL)))	while ((entry = findEntryByPath(cfg, image, prefix, NULL)))
1865	entry->skip = 1;	entry->skip = 1;
#	Line 1507  void markRemovedImage(struct grubConfig	Line 1867  void markRemovedImage(struct grubConfig
1867
1868	void setDefaultImage(struct grubConfig * config, int hasNew,	void setDefaultImage(struct grubConfig * config, int hasNew,
1869	const char * defaultKernelPath, int newIsDefault,	const char * defaultKernelPath, int newIsDefault,
1870	const char * prefix, int flags) {	const char * prefix, int flags, int index) {
1871	struct singleEntry * entry, * entry2, * newDefault;	struct singleEntry * entry, * entry2, * newDefault;
1872	int i, j;	int i, j;
1873
1874	if (newIsDefault) {	if (newIsDefault) {
1875	config->defaultImage = 0;	config->defaultImage = 0;
1876	return;	return;
1877		} else if ((index >= 0) && config->cfi->defaultIsIndex) {
1878		if (findEntryByIndex(config, index))
1879		config->defaultImage = index;
1880		else
1881		config->defaultImage = -1;
1882		return;
1883	} else if (defaultKernelPath) {	} else if (defaultKernelPath) {
1884	i = 0;	i = 0;
1885	if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {	if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {
#	Line 1526  void setDefaultImage(struct grubConfig *	Line 1892  void setDefaultImage(struct grubConfig *
1892
1893	/* defaultImage now points to what we'd like to use, but before any order	/* defaultImage now points to what we'd like to use, but before any order
1894	changes */	changes */
1895	if (config->defaultImage == DEFAULT_SAVED)	if ((config->defaultImage == DEFAULT_SAVED) ||
1896		(config->defaultImage == DEFAULT_SAVED_GRUB2))
1897	/* default is set to saved, we don't want to change it */	/* default is set to saved, we don't want to change it */
1898	return;	return;
1899
#	Line 1593  void displayEntry(struct singleEntry * e	Line 1960  void displayEntry(struct singleEntry * e
1960	return;	return;
1961	}	}
1962
1963	printf("kernel=%s\n", line->elements[1].item);	if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
1964		printf("kernel=%s\n", line->elements[1].item);
1965		else
1966		printf("kernel=%s%s\n", prefix, line->elements[1].item);
1967
1968	if (line->numElements >= 3) {	if (line->numElements >= 3) {
1969	printf("args=\"");	printf("args=\"");
#	Line 1652  void displayEntry(struct singleEntry * e	Line 2022  void displayEntry(struct singleEntry * e
2022	line = getLineByType(LT_INITRD, entry->lines);	line = getLineByType(LT_INITRD, entry->lines);
2023
2024	if (line && line->numElements >= 2) {	if (line && line->numElements >= 2) {
2025	printf("initrd=%s", prefix);	if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
2026		printf("initrd=");
2027		else
2028		printf("initrd=%s", prefix);
2029
2030	for (i = 1; i < line->numElements; i++)	for (i = 1; i < line->numElements; i++)
2031	printf("%s%s", line->elements[i].item, line->elements[i].indent);	printf("%s%s", line->elements[i].item, line->elements[i].indent);
2032	printf("\n");	printf("\n");
2033	}	}
2034
2035		line = getLineByType(LT_TITLE, entry->lines);
2036		if (line) {
2037		printf("title=%s\n", line->elements[1].item);
2038		} else {
2039		char * title;
2040		line = getLineByType(LT_MENUENTRY, entry->lines);
2041		title = grub2ExtractTitle(line);
2042		if (title)
2043		printf("title=%s\n", title);
2044		}
2045		}
2046
2047		int isSuseSystem(void) {
2048		const char * path;
2049		const static char default_path[] = "/etc/SuSE-release";
2050
2051		if ((path = getenv("GRUBBY_SUSE_RELEASE")) == NULL)
2052		path = default_path;
2053
2054		if (!access(path, R_OK))
2055		return 1;
2056		return 0;
2057		}
2058
2059		int isSuseGrubConf(const char * path) {
2060		FILE * grubConf;
2061		char * line = NULL;
2062		size_t len = 0, res = 0;
2063
2064		grubConf = fopen(path, "r");
2065		if (!grubConf) {
2066		dbgPrintf("Could not open SuSE configuration file '%s'\n", path);
2067		return 0;
2068		}
2069
2070		while ((res = getline(&line, &len, grubConf)) != -1) {
2071		if (!strncmp(line, "setup", 5)) {
2072		fclose(grubConf);
2073		free(line);
2074		return 1;
2075		}
2076		}
2077
2078		dbgPrintf("SuSE configuration file '%s' does not appear to be valid\n",
2079		path);
2080
2081		fclose(grubConf);
2082		free(line);
2083		return 0;
2084		}
2085
2086		int suseGrubConfGetLba(const char * path, int * lbaPtr) {
2087		FILE * grubConf;
2088		char * line = NULL;
2089		size_t res = 0, len = 0;
2090
2091		if (!path) return 1;
2092		if (!lbaPtr) return 1;
2093
2094		grubConf = fopen(path, "r");
2095		if (!grubConf) return 1;
2096
2097		while ((res = getline(&line, &len, grubConf)) != -1) {
2098		if (line[res - 1] == '\n')
2099		line[res - 1] = '\0';
2100		else if (len > res)
2101		line[res] = '\0';
2102		else {
2103		line = realloc(line, res + 1);
2104		line[res] = '\0';
2105		}
2106
2107		if (!strncmp(line, "setup", 5)) {
2108		if (strstr(line, "--force-lba")) {
2109		*lbaPtr = 1;
2110		} else {
2111		*lbaPtr = 0;
2112		}
2113		dbgPrintf("lba: %i\n", *lbaPtr);
2114		break;
2115		}
2116		}
2117
2118		free(line);
2119		fclose(grubConf);
2120		return 0;
2121		}
2122
2123		int suseGrubConfGetInstallDevice(const char * path, char ** devicePtr) {
2124		FILE * grubConf;
2125		char * line = NULL;
2126		size_t res = 0, len = 0;
2127		char * lastParamPtr = NULL;
2128		char * secLastParamPtr = NULL;
2129		char installDeviceNumber = '\0';
2130		char * bounds = NULL;
2131
2132		if (!path) return 1;
2133		if (!devicePtr) return 1;
2134
2135		grubConf = fopen(path, "r");
2136		if (!grubConf) return 1;
2137
2138		while ((res = getline(&line, &len, grubConf)) != -1) {
2139		if (strncmp(line, "setup", 5))
2140		continue;
2141
2142		if (line[res - 1] == '\n')
2143		line[res - 1] = '\0';
2144		else if (len > res)
2145		line[res] = '\0';
2146		else {
2147		line = realloc(line, res + 1);
2148		line[res] = '\0';
2149		}
2150
2151		lastParamPtr = bounds = line + res;
2152
2153		/* Last parameter in grub may be an optional IMAGE_DEVICE */
2154		while (!isspace(*lastParamPtr))
2155		lastParamPtr--;
2156		lastParamPtr++;
2157
2158		secLastParamPtr = lastParamPtr - 2;
2159		dbgPrintf("lastParamPtr: %s\n", lastParamPtr);
2160
2161		if (lastParamPtr + 3 > bounds) {
2162		dbgPrintf("lastParamPtr going over boundary");
2163		fclose(grubConf);
2164		free(line);
2165		return 1;
2166		}
2167		if (!strncmp(lastParamPtr, "(hd", 3))
2168		lastParamPtr += 3;
2169		dbgPrintf("lastParamPtr: %c\n", *lastParamPtr);
2170
2171		/*
2172		* Second last parameter will decide wether last parameter is
2173		* an IMAGE_DEVICE or INSTALL_DEVICE
2174		*/
2175		while (!isspace(*secLastParamPtr))
2176		secLastParamPtr--;
2177		secLastParamPtr++;
2178
2179		if (secLastParamPtr + 3 > bounds) {
2180		dbgPrintf("secLastParamPtr going over boundary");
2181		fclose(grubConf);
2182		free(line);
2183		return 1;
2184		}
2185		dbgPrintf("secLastParamPtr: %s\n", secLastParamPtr);
2186		if (!strncmp(secLastParamPtr, "(hd", 3)) {
2187		secLastParamPtr += 3;
2188		dbgPrintf("secLastParamPtr: %c\n", *secLastParamPtr);
2189		installDeviceNumber = *secLastParamPtr;
2190		} else {
2191		installDeviceNumber = *lastParamPtr;
2192		}
2193
2194		*devicePtr = malloc(6);
2195		snprintf(*devicePtr, 6, "(hd%c)", installDeviceNumber);
2196		dbgPrintf("installDeviceNumber: %c\n", installDeviceNumber);
2197		fclose(grubConf);
2198		free(line);
2199		return 0;
2200		}
2201
2202		free(line);
2203		fclose(grubConf);
2204		return 1;
2205		}
2206
2207		int grubGetBootFromDeviceMap(const char * device,
2208		char ** bootPtr) {
2209		FILE * deviceMap;
2210		char * line = NULL;
2211		size_t res = 0, len = 0;
2212		char * devicePtr;
2213		char * bounds = NULL;
2214		const char * path;
2215		const static char default_path[] = "/boot/grub/device.map";
2216
2217		if (!device) return 1;
2218		if (!bootPtr) return 1;
2219
2220		if ((path = getenv("GRUBBY_GRUB_DEVICE_MAP")) == NULL)
2221		path = default_path;
2222
2223		dbgPrintf("opening grub device.map file from: %s\n", path);
2224		deviceMap = fopen(path, "r");
2225		if (!deviceMap)
2226		return 1;
2227
2228		while ((res = getline(&line, &len, deviceMap)) != -1) {
2229		if (!strncmp(line, "#", 1))
2230		continue;
2231
2232		if (line[res - 1] == '\n')
2233		line[res - 1] = '\0';
2234		else if (len > res)
2235		line[res] = '\0';
2236		else {
2237		line = realloc(line, res + 1);
2238		line[res] = '\0';
2239		}
2240
2241		devicePtr = line;
2242		bounds = line + res;
2243
2244		while ((isspace(*line) && ((devicePtr + 1) <= bounds)))
2245		devicePtr++;
2246		dbgPrintf("device: %s\n", devicePtr);
2247
2248		if (!strncmp(devicePtr, device, strlen(device))) {
2249		devicePtr += strlen(device);
2250		while (isspace(*devicePtr) && ((devicePtr + 1) <= bounds))
2251		devicePtr++;
2252
2253		*bootPtr = strdup(devicePtr);
2254		break;
2255		}
2256		}
2257
2258		free(line);
2259		fclose(deviceMap);
2260		return 0;
2261		}
2262
2263		int suseGrubConfGetBoot(const char * path, char ** bootPtr) {
2264		char * grubDevice;
2265
2266		if (suseGrubConfGetInstallDevice(path, &grubDevice))
2267		dbgPrintf("error looking for grub installation device\n");
2268		else
2269		dbgPrintf("grubby installation device: %s\n", grubDevice);
2270
2271		if (grubGetBootFromDeviceMap(grubDevice, bootPtr))
2272		dbgPrintf("error looking for grub boot device\n");
2273		else
2274		dbgPrintf("grubby boot device: %s\n", *bootPtr);
2275
2276		free(grubDevice);
2277		return 0;
2278		}
2279
2280		int parseSuseGrubConf(int * lbaPtr, char ** bootPtr) {
2281		/*
2282		* This SuSE grub configuration file at this location is not your average
2283		* grub configuration file, but instead the grub commands used to setup
2284		* grub on that system.
2285		*/
2286		const char * path;
2287		const static char default_path[] = "/etc/grub.conf";
2288
2289		if ((path = getenv("GRUBBY_SUSE_GRUB_CONF")) == NULL)
2290		path = default_path;
2291
2292		if (!isSuseGrubConf(path)) return 1;
2293
2294		if (lbaPtr) {
2295		*lbaPtr = 0;
2296		if (suseGrubConfGetLba(path, lbaPtr))
2297		return 1;
2298		}
2299
2300		if (bootPtr) {
2301		*bootPtr = NULL;
2302		suseGrubConfGetBoot(path, bootPtr);
2303		}
2304
2305		return 0;
2306	}	}
2307
2308	int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {	int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {
#	Line 1707  int parseSysconfigGrub(int * lbaPtr, cha	Line 2353  int parseSysconfigGrub(int * lbaPtr, cha
2353	}	}
2354
2355	void dumpSysconfigGrub(void) {	void dumpSysconfigGrub(void) {
2356	char * boot;	char * boot = NULL;
2357	int lba;	int lba;
2358
2359	if (!parseSysconfigGrub(&lba, &boot)) {	if (isSuseSystem()) {
2360	if (lba) printf("lba\n");	if (parseSuseGrubConf(&lba, &boot)) {
2361	if (boot) printf("boot=%s\n", boot);	free(boot);
2362		return;
2363		}
2364		} else {
2365		if (parseSysconfigGrub(&lba, &boot)) {
2366		free(boot);
2367		return;
2368		}
2369		}
2370
2371		if (lba) printf("lba\n");
2372		if (boot) {
2373		printf("boot=%s\n", boot);
2374		free(boot);
2375	}	}
2376	}	}
2377
#	Line 1817  struct singleLine *  addLine(struct sing	Line 2476  struct singleLine *  addLine(struct sing
2476	sprintf(tmpl.elements[0].item, "[%s]", val);	sprintf(tmpl.elements[0].item, "[%s]", val);
2477	tmpl.elements[0].indent = "";	tmpl.elements[0].indent = "";
2478	val = NULL;	val = NULL;
2479		} else if (type == LT_MENUENTRY) {
2480		char *lineend = "--class gnu-linux --class gnu --class os {";
2481		if (!val) {
2482		fprintf(stderr, "Line type LT_MENUENTRY requires a value\n");
2483		abort();
2484		}
2485		kw = getKeywordByType(type, cfi);
2486		if (!kw) {
2487		fprintf(stderr, "Looking up keyword for unknown type %d\n", type);
2488		abort();
2489		}
2490		tmpl.indent = "";
2491		tmpl.type = type;
2492		tmpl.numElements = 3;
2493		tmpl.elements = alloca(sizeof(*tmpl.elements) * tmpl.numElements);
2494		tmpl.elements[0].item = kw->key;
2495		tmpl.elements[0].indent = alloca(2);
2496		sprintf(tmpl.elements[0].indent, "%c", kw->nextChar);
2497		tmpl.elements[1].item = (char *)val;
2498		tmpl.elements[1].indent = alloca(2);
2499		sprintf(tmpl.elements[1].indent, "%c", kw->nextChar);
2500		tmpl.elements[2].item = alloca(strlen(lineend)+1);
2501		strcpy(tmpl.elements[2].item, lineend);
2502		tmpl.elements[2].indent = "";
2503	} else {	} else {
2504	kw = getKeywordByType(type, cfi);	kw = getKeywordByType(type, cfi);
2505	if (!kw) abort();	if (!kw) {
2506		fprintf(stderr, "Looking up keyword for unknown type %d\n", type);
2507		abort();
2508		}
2509	tmpl.type = type;	tmpl.type = type;
2510	tmpl.numElements = val ? 2 : 1;	tmpl.numElements = val ? 2 : 1;
2511	tmpl.elements = alloca(sizeof(*tmpl.elements) * tmpl.numElements);	tmpl.elements = alloca(sizeof(*tmpl.elements) * tmpl.numElements);
#	Line 1843  struct singleLine *  addLine(struct sing	Line 2529  struct singleLine *  addLine(struct sing
2529	if (!line->next && !prev) prev = line;	if (!line->next && !prev) prev = line;
2530	}	}
2531
2532	if (prev == entry->lines)	struct singleLine *menuEntry;
2533	tmpl.indent = defaultIndent ?: "";	menuEntry = getLineByType(LT_MENUENTRY, entry->lines);
2534	else	if (tmpl.type == LT_ENTRY_END) {
2535	tmpl.indent = prev->indent;	if (menuEntry)
2536		tmpl.indent = menuEntry->indent;
2537		else
2538		tmpl.indent = defaultIndent ?: "";
2539		} else if (tmpl.type != LT_MENUENTRY) {
2540		if (menuEntry)
2541		tmpl.indent = "\t";
2542		else if (prev == entry->lines)
2543		tmpl.indent = defaultIndent ?: "";
2544		else
2545		tmpl.indent = prev->indent;
2546		}
2547
2548	return addLineTmpl(entry, &tmpl, prev, val, cfi);	return addLineTmpl(entry, &tmpl, prev, val, cfi);
2549	}	}
#	Line 1873  void removeLine(struct singleEntry * ent	Line 2570  void removeLine(struct singleEntry * ent
2570	free(line);	free(line);
2571	}	}
2572
2573		static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)
2574		{
2575		struct singleLine newLine = {
2576		.indent = tmplLine->indent,
2577		.type = tmplLine->type,
2578		.next = tmplLine->next,
2579		};
2580		int firstQuotedItem = -1;
2581		int quoteLen = 0;
2582		int j;
2583		int element = 0;
2584		char *c;
2585
2586		c = malloc(strlen(tmplLine->elements[0].item) + 1);
2587		strcpy(c, tmplLine->elements[0].item);
2588		insertElement(&newLine, c, element++, cfi);
2589		free(c);
2590		c = NULL;
2591
2592		for (j = 1; j < tmplLine->numElements; j++) {
2593		if (firstQuotedItem == -1) {
2594		quoteLen += strlen(tmplLine->elements[j].item);
2595
2596		if (isquote(tmplLine->elements[j].item[0])) {
2597		firstQuotedItem = j;
2598		quoteLen += strlen(tmplLine->elements[j].indent);
2599		} else {
2600		c = malloc(quoteLen + 1);
2601		strcpy(c, tmplLine->elements[j].item);
2602		insertElement(&newLine, c, element++, cfi);
2603		free(c);
2604		quoteLen = 0;
2605		}
2606		} else {
2607		int itemlen = strlen(tmplLine->elements[j].item);
2608		quoteLen += itemlen;
2609		quoteLen += strlen(tmplLine->elements[j].indent);
2610
2611		if (isquote(tmplLine->elements[j].item[itemlen - 1])) {
2612		c = malloc(quoteLen + 1);
2613		c[0] = '\0';
2614		for (int i = firstQuotedItem; i < j+1; i++) {
2615		strcat(c, tmplLine->elements[i].item);
2616		strcat(c, tmplLine->elements[i].indent);
2617		}
2618		insertElement(&newLine, c, element++, cfi);
2619		free(c);
2620
2621		firstQuotedItem = -1;
2622		quoteLen = 0;
2623		}
2624		}
2625		}
2626		while (tmplLine->numElements)
2627		removeElement(tmplLine, 0);
2628		if (tmplLine->elements)
2629		free(tmplLine->elements);
2630
2631		tmplLine->numElements = newLine.numElements;
2632		tmplLine->elements = newLine.elements;
2633		}
2634
2635	static void insertElement(struct singleLine * line,	static void insertElement(struct singleLine * line,
2636	const char * item, int insertHere,	const char * item, int insertHere,
2637	struct configFileInfo * cfi)	struct configFileInfo * cfi)
#	Line 1979  int updateActualImage(struct grubConfig	Line 2738  int updateActualImage(struct grubConfig
2738	const char ** arg;	const char ** arg;
2739	int useKernelArgs, useRoot;	int useKernelArgs, useRoot;
2740	int firstElement;	int firstElement;
2741	int *usedElements, *usedArgs;	int *usedElements;
2742	int doreplace;	int doreplace;
2743
2744	if (!image) return 0;	if (!image) return 0;
#	Line 2014  int updateActualImage(struct grubConfig	Line 2773  int updateActualImage(struct grubConfig
2773	useRoot = (getKeywordByType(LT_ROOT, cfg->cfi)	useRoot = (getKeywordByType(LT_ROOT, cfg->cfi)
2774	&& !multibootArgs);	&& !multibootArgs);
2775
	for (k = 0, arg = newArgs; *arg; arg++, k++) ;
	usedArgs = calloc(k, sizeof(*usedArgs));
2776	for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {	for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
2777
2778	if (multibootArgs && !entry->multiboot)	if (multibootArgs && !entry->multiboot)
#	Line 2092  int updateActualImage(struct grubConfig	Line 2848  int updateActualImage(struct grubConfig
2848	usedElements = calloc(line->numElements, sizeof(*usedElements));	usedElements = calloc(line->numElements, sizeof(*usedElements));
2849
2850	for (k = 0, arg = newArgs; *arg; arg++, k++) {	for (k = 0, arg = newArgs; *arg; arg++, k++) {
	if (usedArgs[k]) continue;
2851
2852	doreplace = 1;	doreplace = 1;
2853	for (i = firstElement; i < line->numElements; i++) {	for (i = firstElement; i < line->numElements; i++) {
#	Line 2107  int updateActualImage(struct grubConfig	Line 2862  int updateActualImage(struct grubConfig
2862	continue;	continue;
2863	if (!argMatch(line->elements[i].item, *arg)) {	if (!argMatch(line->elements[i].item, *arg)) {
2864	usedElements[i]=1;	usedElements[i]=1;
	usedArgs[k]=1;
2865	break;	break;
2866	}	}
2867	}	}
#	Line 2177  int updateActualImage(struct grubConfig	Line 2931  int updateActualImage(struct grubConfig
2931	}	}
2932	}	}
2933
	free(usedArgs);
2934	free(newArgs);	free(newArgs);
2935	free(oldArgs);	free(oldArgs);
2936
#	Line 2206  int updateImage(struct grubConfig * cfg,	Line 2959  int updateImage(struct grubConfig * cfg,
2959	int updateInitrd(struct grubConfig * cfg, const char * image,	int updateInitrd(struct grubConfig * cfg, const char * image,
2960	const char * prefix, const char * initrd) {	const char * prefix, const char * initrd) {
2961	struct singleEntry * entry;	struct singleEntry * entry;
2962	struct singleLine * line, * kernelLine;	struct singleLine * line, * kernelLine, *endLine = NULL;
2963	int index = 0;	int index = 0;
2964
2965	if (!image) return 0;	if (!image) return 0;
#	Line 2223  int updateInitrd(struct grubConfig * cfg	Line 2976  int updateInitrd(struct grubConfig * cfg
2976	if (!strncmp(initrd, prefix, prefixLen))	if (!strncmp(initrd, prefix, prefixLen))
2977	initrd += prefixLen;	initrd += prefixLen;
2978	}	}
2979		endLine = getLineByType(LT_ENTRY_END, entry->lines);
2980		if (endLine)
2981		removeLine(entry, endLine);
2982	line = addLine(entry, cfg->cfi, LT_INITRD, kernelLine->indent, initrd);	line = addLine(entry, cfg->cfi, LT_INITRD, kernelLine->indent, initrd);
2983	if (!line) return 1;	if (!line)
2984		return 1;
2985		if (endLine) {
2986		line = addLine(entry, cfg->cfi, LT_ENTRY_END, "", NULL);
2987		if (!line)
2988		return 1;
2989		}
2990
2991	break;	break;
2992	}	}
2993
#	Line 2254  int checkDeviceBootloader(const char * d	Line 3017  int checkDeviceBootloader(const char * d
3017	if (memcmp(boot, bootSect, 3))	if (memcmp(boot, bootSect, 3))
3018	return 0;	return 0;
3019
3020	if (boot[1] == 0xeb) {	if (boot[1] == JMP_SHORT_OPCODE) {
3021	offset = boot[2] + 2;	offset = boot[2] + 2;
3022	} else if (boot[1] == 0xe8 || boot[1] == 0xe9) {	} else if (boot[1] == 0xe8 || boot[1] == 0xe9) {
3023	offset = (boot[3] << 8) + boot[2] + 2;	offset = (boot[3] << 8) + boot[2] + 2;
3024	} else if (boot[0] == 0xeb) {	} else if (boot[0] == JMP_SHORT_OPCODE) {
3025	offset = boot[1] + 2;	offset = boot[1] + 2;
3026		/*
3027		* it looks like grub, when copying stage1 into the mbr, patches stage1
3028		* right after the JMP location, replacing other instructions such as
3029		* JMPs for NOOPs. So, relax the check a little bit by skipping those
3030		* different bytes.
3031		*/
3032		if ((bootSect[offset + 1] == NOOP_OPCODE)
3033		&& (bootSect[offset + 2] == NOOP_OPCODE)) {
3034		offset = offset + 3;
3035		}
3036	} else if (boot[0] == 0xe8 || boot[0] == 0xe9) {	} else if (boot[0] == 0xe8 || boot[0] == 0xe9) {
3037	offset = (boot[2] << 8) + boot[1] + 2;	offset = (boot[2] << 8) + boot[1] + 2;
3038	} else {	} else {
#	Line 2401  int checkForLilo(struct grubConfig * con	Line 3174  int checkForLilo(struct grubConfig * con
3174	return checkDeviceBootloader(line->elements[1].item, boot);	return checkDeviceBootloader(line->elements[1].item, boot);
3175	}	}
3176
3177		int checkForGrub2(struct grubConfig * config) {
3178		if (!access("/etc/grub.d/", R_OK))
3179		return 2;
3180
3181		return 1;
3182		}
3183
3184	int checkForGrub(struct grubConfig * config) {	int checkForGrub(struct grubConfig * config) {
3185	int fd;	int fd;
3186	unsigned char bootSect[512];	unsigned char bootSect[512];
3187	char * boot;	char * boot;
3188		int onSuse = isSuseSystem();
3189
3190	if (parseSysconfigGrub(NULL, &boot))
3191	return 0;	if (onSuse) {
3192		if (parseSuseGrubConf(NULL, &boot))
3193		return 0;
3194		} else {
3195		if (parseSysconfigGrub(NULL, &boot))
3196		return 0;
3197		}
3198
3199	/* assume grub is not installed -- not an error condition */	/* assume grub is not installed -- not an error condition */
3200	if (!boot)	if (!boot)
#	Line 2426  int checkForGrub(struct grubConfig * con	Line 3213  int checkForGrub(struct grubConfig * con
3213	}	}
3214	close(fd);	close(fd);
3215
3216		/* The more elaborate checks do not work on SuSE. The checks done
3217		* seem to be reasonble (at least for now), so just return success
3218		*/
3219		if (onSuse)
3220		return 2;
3221
3222	return checkDeviceBootloader(boot, bootSect);	return checkDeviceBootloader(boot, bootSect);
3223	}	}
3224
#	Line 2459  int checkForExtLinux(struct grubConfig *	Line 3252  int checkForExtLinux(struct grubConfig *
3252	return checkDeviceBootloader(boot, bootSect);	return checkDeviceBootloader(boot, bootSect);
3253	}	}
3254
3255		int checkForYaboot(struct grubConfig * config) {
3256		/*
3257		* This is a simplistic check that we consider good enough for own puporses
3258		*
3259		* If we were to properly check if yaboot is *installed* we'd need to:
3260		* 1) get the system boot device (LT_BOOT)
3261		* 2) considering it's a raw filesystem, check if the yaboot binary matches
3262		*    the content on the boot device
3263		* 3) if not, copy the binary to a temporary file and run "addnote" on it
3264		* 4) check again if binary and boot device contents match
3265		*/
3266		if (!access("/etc/yaboot.conf", R_OK))
3267		return 2;
3268
3269		return 1;
3270		}
3271
3272		int checkForElilo(struct grubConfig * config) {
3273		if (!access("/etc/elilo.conf", R_OK))
3274		return 2;
3275
3276		return 1;
3277		}
3278
3279	static char * getRootSpecifier(char * str) {	static char * getRootSpecifier(char * str) {
3280	char * idx, * rootspec = NULL;	char * idx, * rootspec = NULL;
3281
#	Line 2473  static char * getRootSpecifier(char * st	Line 3290  static char * getRootSpecifier(char * st
3290	static char * getInitrdVal(struct grubConfig * config,	static char * getInitrdVal(struct grubConfig * config,
3291	const char * prefix, struct singleLine *tmplLine,	const char * prefix, struct singleLine *tmplLine,
3292	const char * newKernelInitrd,	const char * newKernelInitrd,
3293	char ** extraInitrds, int extraInitrdCount)	const char ** extraInitrds, int extraInitrdCount)
3294	{	{
3295	char *initrdVal, *end;	char *initrdVal, *end;
3296	int i;	int i;
#	Line 2518  static char * getInitrdVal(struct grubCo	Line 3335  static char * getInitrdVal(struct grubCo
3335
3336	int addNewKernel(struct grubConfig * config, struct singleEntry * template,	int addNewKernel(struct grubConfig * config, struct singleEntry * template,
3337	const char * prefix,	const char * prefix,
3338	char * newKernelPath, char * newKernelTitle,	const char * newKernelPath, const char * newKernelTitle,
3339	char * newKernelArgs, char * newKernelInitrd,	const char * newKernelArgs, const char * newKernelInitrd,
3340	char ** extraInitrds, int extraInitrdCount,	const char ** extraInitrds, int extraInitrdCount,
3341	char * newMBKernel, char * newMBKernelArgs) {	const char * newMBKernel, const char * newMBKernelArgs) {
3342	struct singleEntry * new;	struct singleEntry * new;
3343	struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;	struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
3344	int needs;	int needs;
#	Line 2576  int addNewKernel(struct grubConfig * con	Line 3393  int addNewKernel(struct grubConfig * con
3393	if (*chptr == '#') continue;	if (*chptr == '#') continue;
3394
3395	if (tmplLine->type == LT_KERNEL &&	if (tmplLine->type == LT_KERNEL &&
3396	tmplLine->numElements >= 2) {	tmplLine->numElements >= 2) {
3397	if (!template->multiboot && (needs & NEED_MB)) {	if (!template->multiboot && (needs & NEED_MB)) {
3398	/* it's not a multiboot template and this is the kernel	/* it's not a multiboot template and this is the kernel
3399	* line.  Try to be intelligent about inserting the	* line.  Try to be intelligent about inserting the
#	Line 2702  int addNewKernel(struct grubConfig * con	Line 3519  int addNewKernel(struct grubConfig * con
3519	needs &= ~NEED_INITRD;	needs &= ~NEED_INITRD;
3520	}	}
3521
3522		} else if (tmplLine->type == LT_MENUENTRY &&
3523		(needs & NEED_TITLE)) {
3524		requote(tmplLine, config->cfi);
3525		char *nkt = malloc(strlen(newKernelTitle)+3);
3526		strcpy(nkt, "'");
3527		strcat(nkt, newKernelTitle);
3528		strcat(nkt, "'");
3529		newLine = addLineTmpl(new, tmplLine, newLine, nkt, config->cfi);
3530		free(nkt);
3531		needs &= ~NEED_TITLE;
3532	} else if (tmplLine->type == LT_TITLE &&	} else if (tmplLine->type == LT_TITLE &&
3533	(needs & NEED_TITLE)) {	(needs & NEED_TITLE)) {
3534	if (tmplLine->numElements >= 2) {	if (tmplLine->numElements >= 2) {
#	Line 2715  int addNewKernel(struct grubConfig * con	Line 3542  int addNewKernel(struct grubConfig * con
3542	tmplLine->indent, newKernelTitle);	tmplLine->indent, newKernelTitle);
3543	needs &= ~NEED_TITLE;	needs &= ~NEED_TITLE;
3544	}	}
3545		} else if (tmplLine->type == LT_ECHO) {
3546		requote(tmplLine, config->cfi);
3547		static const char *prefix = "'Loading ";
3548		if (tmplLine->numElements > 1 &&
3549		strstr(tmplLine->elements[1].item, prefix) &&
3550		masterLine->next && masterLine->next->type == LT_KERNEL) {
3551		char *newTitle = malloc(strlen(prefix) +
3552		strlen(newKernelTitle) + 2);
3553
3554		strcpy(newTitle, prefix);
3555		strcat(newTitle, newKernelTitle);
3556		strcat(newTitle, "'");
3557		newLine = addLine(new, config->cfi, LT_ECHO,
3558		tmplLine->indent, newTitle);
3559		free(newTitle);
3560		} else {
3561		/* pass through other lines from the template */
3562		newLine = addLineTmpl(new, tmplLine, newLine, NULL,
3563		config->cfi);
3564		}
3565	} else {	} else {
3566	/* pass through other lines from the template */	/* pass through other lines from the template */
3567	newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);	newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
#	Line 2726  int addNewKernel(struct grubConfig * con	Line 3572  int addNewKernel(struct grubConfig * con
3572	/* don't have a template, so start the entry with the	/* don't have a template, so start the entry with the
3573	* appropriate starting line	* appropriate starting line
3574	*/	*/
3575	switch (config->cfi->entrySeparator) {	switch (config->cfi->entryStart) {
3576	case LT_KERNEL:	case LT_KERNEL:
3577	if (new->multiboot && config->cfi->mbHyperFirst) {	if (new->multiboot && config->cfi->mbHyperFirst) {
3578	/* fall through to LT_HYPER */	/* fall through to LT_HYPER */
#	Line 2745  int addNewKernel(struct grubConfig * con	Line 3591  int addNewKernel(struct grubConfig * con
3591	needs &= ~NEED_MB;	needs &= ~NEED_MB;
3592	break;	break;
3593
3594		case LT_MENUENTRY: {
3595		char *nkt = malloc(strlen(newKernelTitle)+3);
3596		strcpy(nkt, "'");
3597		strcat(nkt, newKernelTitle);
3598		strcat(nkt, "'");
3599		newLine = addLine(new, config->cfi, LT_MENUENTRY,
3600		config->primaryIndent, nkt);
3601		free(nkt);
3602		needs &= ~NEED_TITLE;
3603		needs |= NEED_END;
3604		break;
3605		}
3606	case LT_TITLE:	case LT_TITLE:
3607	if( useextlinuxmenu != 0 ){ // We just need useextlinuxmenu to not be zero (set above)	if( useextlinuxmenu != 0 ){ // We just need useextlinuxmenu to not be zero (set above)
3608	char * templabel;	char * templabel;
#	Line 2778  int addNewKernel(struct grubConfig * con	Line 3636  int addNewKernel(struct grubConfig * con
3636
3637	/* add the remainder of the lines, i.e. those that either	/* add the remainder of the lines, i.e. those that either
3638	* weren't present in the template, or in the case of no template,	* weren't present in the template, or in the case of no template,
3639	* all the lines following the entrySeparator.	* all the lines following the entryStart.
3640	*/	*/
3641	if (needs & NEED_TITLE) {	if (needs & NEED_TITLE) {
3642	newLine = addLine(new, config->cfi, LT_TITLE,	newLine = addLine(new, config->cfi, LT_TITLE,
#	Line 2819  int addNewKernel(struct grubConfig * con	Line 3677  int addNewKernel(struct grubConfig * con
3677	free(initrdVal);	free(initrdVal);
3678	needs &= ~NEED_INITRD;	needs &= ~NEED_INITRD;
3679	}	}
3680		if (needs & NEED_END) {
3681		newLine = addLine(new, config->cfi, LT_ENTRY_END,
3682		config->secondaryIndent, NULL);
3683		needs &= ~NEED_END;
3684		}
3685
3686	if (needs) {	if (needs) {
3687	printf(_("grubby: needs=%d, aborting\n"), needs);	printf(_("grubby: needs=%d, aborting\n"), needs);
#	Line 2848  static void traceback(int signum)	Line 3711  static void traceback(int signum)
3711
3712	int main(int argc, const char ** argv) {	int main(int argc, const char ** argv) {
3713	poptContext optCon;	poptContext optCon;
3714	char * grubConfig = NULL;	const char * grubConfig = NULL;
3715	char * outputFile = NULL;	char * outputFile = NULL;
3716	int arg = 0;	int arg = 0;
3717	int flags = 0;	int flags = 0;
3718	int badImageOkay = 0;	int badImageOkay = 0;
3719		int configureGrub2 = 0;
3720	int configureLilo = 0, configureELilo = 0, configureGrub = 0;	int configureLilo = 0, configureELilo = 0, configureGrub = 0;
3721	int configureYaboot = 0, configureSilo = 0, configureZipl = 0;	int configureYaboot = 0, configureSilo = 0, configureZipl = 0;
3722	int configureExtLinux = 0;	int configureExtLinux = 0;
#	Line 2880  int main(int argc, const char ** argv) {	Line 3744  int main(int argc, const char ** argv) {
3744	struct singleEntry * template = NULL;	struct singleEntry * template = NULL;
3745	int copyDefault = 0, makeDefault = 0;	int copyDefault = 0, makeDefault = 0;
3746	int displayDefault = 0;	int displayDefault = 0;
3747		int displayDefaultIndex = 0;
3748		int displayDefaultTitle = 0;
3749		int defaultIndex = -1;
3750	struct poptOption options[] = {	struct poptOption options[] = {
3751	{ "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,	{ "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,
3752	_("add an entry for the specified kernel"), _("kernel-path") },	_("add an entry for the specified kernel"), _("kernel-path") },
#	Line 2897  int main(int argc, const char ** argv) {	Line 3764  int main(int argc, const char ** argv) {
3764	{ "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,	{ "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
3765	_("filestystem which contains /boot directory (for testing only)"),	_("filestystem which contains /boot directory (for testing only)"),
3766	_("bootfs") },	_("bootfs") },
3767	#if defined(__i386__) || defined(__x86_64__)	#if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
3768	{ "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,	{ "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
3769	_("check if lilo is installed on lilo.conf boot sector") },	_("check which bootloader is installed on boot sector") },
3770	#endif	#endif
3771	{ "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,	{ "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,
3772	_("path to grub config file to update (\"-\" for stdin)"),	_("path to grub config file to update (\"-\" for stdin)"),
#	Line 2910  int main(int argc, const char ** argv) {	Line 3777  int main(int argc, const char ** argv) {
3777	"the kernel referenced by the default image does not exist, "	"the kernel referenced by the default image does not exist, "
3778	"the first linux entry whose kernel does exist is used as the "	"the first linux entry whose kernel does exist is used as the "
3779	"template"), NULL },	"template"), NULL },
3780		{ "debug", 0, 0, &debug, 0,
3781		_("print debugging information for failures") },
3782	{ "default-kernel", 0, 0, &displayDefault, 0,	{ "default-kernel", 0, 0, &displayDefault, 0,
3783	_("display the path of the default kernel") },	_("display the path of the default kernel") },
3784		{ "default-index", 0, 0, &displayDefaultIndex, 0,
3785		_("display the index of the default kernel") },
3786		{ "default-title", 0, 0, &displayDefaultTitle, 0,
3787		_("display the title of the default kernel") },
3788	{ "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,	{ "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
3789	_("configure elilo bootloader") },	_("configure elilo bootloader") },
3790	{ "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,	{ "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,
3791	_("configure extlinux bootloader (from syslinux)") },	_("configure extlinux bootloader (from syslinux)") },
3792	{ "grub", 0, POPT_ARG_NONE, &configureGrub, 0,	{ "grub", 0, POPT_ARG_NONE, &configureGrub, 0,
3793	_("configure grub bootloader") },	_("configure grub bootloader") },
3794		{ "grub2", 0, POPT_ARG_NONE, &configureGrub2, 0,
3795		_("configure grub2 bootloader") },
3796	{ "info", 0, POPT_ARG_STRING, &kernelInfo, 0,	{ "info", 0, POPT_ARG_STRING, &kernelInfo, 0,
3797	_("display boot information for specified kernel"),	_("display boot information for specified kernel"),
3798	_("kernel-path") },	_("kernel-path") },
#	Line 2944  int main(int argc, const char ** argv) {	Line 3819  int main(int argc, const char ** argv) {
3819	{ "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,	{ "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,
3820	_("make the first entry referencing the specified kernel "	_("make the first entry referencing the specified kernel "
3821	"the default"), _("kernel-path") },	"the default"), _("kernel-path") },
3822		{ "set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,
3823		_("make the given entry index the default entry"),
3824		_("entry-index") },
3825	{ "silo", 0, POPT_ARG_NONE, &configureSilo, 0,	{ "silo", 0, POPT_ARG_NONE, &configureSilo, 0,
3826	_("configure silo bootloader") },	_("configure silo bootloader") },
3827	{ "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,	{ "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,
#	Line 2997  int main(int argc, const char ** argv) {	Line 3875  int main(int argc, const char ** argv) {
3875	return 1;	return 1;
3876	}	}
3877
3878	if ((configureLilo + configureGrub + configureELilo +	if ((configureLilo + configureGrub2 + configureGrub + configureELilo +
3879	configureYaboot + configureSilo + configureZipl +	configureYaboot + configureSilo + configureZipl +
3880	configureExtLinux ) > 1) {	configureExtLinux ) > 1) {
3881	fprintf(stderr, _("grubby: cannot specify multiple bootloaders\n"));	fprintf(stderr, _("grubby: cannot specify multiple bootloaders\n"));
#	Line 3006  int main(int argc, const char ** argv) {	Line 3884  int main(int argc, const char ** argv) {
3884	fprintf(stderr,	fprintf(stderr,
3885	_("grubby: cannot specify config file with --bootloader-probe\n"));	_("grubby: cannot specify config file with --bootloader-probe\n"));
3886	return 1;	return 1;
3887		} else if (configureGrub2) {
3888		cfi = &grub2ConfigType;
3889	} else if (configureLilo) {	} else if (configureLilo) {
3890	cfi = &liloConfigType;	cfi = &liloConfigType;
3891	} else if (configureGrub) {	} else if (configureGrub) {
#	Line 3024  int main(int argc, const char ** argv) {	Line 3904  int main(int argc, const char ** argv) {
3904	}	}
3905
3906	if (!cfi) {	if (!cfi) {
3907		if (grub2FindConfig(&grub2ConfigType))
3908		cfi = &grub2ConfigType;
3909		else
3910	#ifdef __ia64__	#ifdef __ia64__
3911	cfi = &eliloConfigType;	cfi = &eliloConfigType;
3912	#elif __powerpc__	#elif __powerpc__
3913	cfi = &yabootConfigType;	cfi = &yabootConfigType;
3914	#elif __sparc__	#elif __sparc__
3915	cfi = &siloConfigType;	cfi = &siloConfigType;
3916	#elif __s390__	#elif __s390__
3917	cfi = &ziplConfigType;	cfi = &ziplConfigType;
3918	#elif __s390x__	#elif __s390x__
3919	cfi = &ziplConfigtype;	cfi = &ziplConfigtype;
3920	#else	#else
3921	cfi = &grubConfigType;	cfi = &grubConfigType;
3922	#endif	#endif
3923	}	}
3924
3925	if (!grubConfig)	if (!grubConfig) {
3926	grubConfig = cfi->defaultConfig;	if (cfi->findConfig)
3927		grubConfig = cfi->findConfig(cfi);
3928		if (!grubConfig)
3929		grubConfig = cfi->defaultConfig;
3930		}
3931
3932	if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||	if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||
3933	newKernelPath || removeKernelPath || makeDefault ||	newKernelPath || removeKernelPath || makeDefault ||
3934	defaultKernel)) {	defaultKernel || displayDefaultIndex || displayDefaultTitle ||
3935		(defaultIndex >= 0))) {
3936	fprintf(stderr, _("grubby: --bootloader-probe may not be used with "	fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
3937	"specified option"));	"specified option"));
3938	return 1;	return 1;
#	Line 3086  int main(int argc, const char ** argv) {	Line 3974  int main(int argc, const char ** argv) {
3974	makeDefault = 1;	makeDefault = 1;
3975	defaultKernel = NULL;	defaultKernel = NULL;
3976	}	}
3977		else if (defaultKernel && (defaultIndex >= 0)) {
3978		fprintf(stderr, _("grubby: --set-default and --set-default-index "
3979		"may not be used together\n"));
3980		return 1;
3981		}
3982
3983	if (!strcmp(grubConfig, "-") && !outputFile) {	if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {
3984	fprintf(stderr, _("grubby: output file must be specified if stdin "	fprintf(stderr, _("grubby: output file must be specified if stdin "
3985	"is used\n"));	"is used\n"));
3986	return 1;	return 1;
3987	}	}
3988
3989	if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel	if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
3990	&& !kernelInfo && !bootloaderProbe && !updateKernelPath	&& !kernelInfo && !bootloaderProbe && !updateKernelPath
3991	&& !removeMBKernel) {	&& !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle
3992		&& (defaultIndex == -1)) {
3993	fprintf(stderr, _("grubby: no action specified\n"));	fprintf(stderr, _("grubby: no action specified\n"));
3994	return 1;	return 1;
3995	}	}
#	Line 3122  int main(int argc, const char ** argv) {	Line 4016  int main(int argc, const char ** argv) {
4016	}	}
4017
4018	if (bootloaderProbe) {	if (bootloaderProbe) {
4019	int lrc = 0, grc = 0, erc = 0;	int lrc = 0, grc = 0, gr2c = 0, extrc = 0, yrc = 0, erc = 0;
4020	struct grubConfig * lconfig, * gconfig;	struct grubConfig * lconfig, * gconfig, * yconfig, * econfig;
4021
4022	if (!access(grubConfigType.defaultConfig, F_OK)) {	const char *grub2config = grub2FindConfig(&grub2ConfigType);
4023	gconfig = readConfig(grubConfigType.defaultConfig, &grubConfigType);	if (grub2config) {
4024		gconfig = readConfig(grub2config, &grub2ConfigType);
4025		if (!gconfig)
4026		gr2c = 1;
4027		else
4028		gr2c = checkForGrub2(gconfig);
4029		}
4030
4031		const char *grubconfig = grubFindConfig(&grubConfigType);
4032		if (!access(grubconfig, F_OK)) {
4033		gconfig = readConfig(grubconfig, &grubConfigType);
4034	if (!gconfig)	if (!gconfig)
4035	grc = 1;	grc = 1;
4036	else	else
#	Line 3141  int main(int argc, const char ** argv) {	Line 4045  int main(int argc, const char ** argv) {
4045	lrc = checkForLilo(lconfig);	lrc = checkForLilo(lconfig);
4046	}	}
4047
4048		if (!access(eliloConfigType.defaultConfig, F_OK)) {
4049		econfig = readConfig(eliloConfigType.defaultConfig,
4050		&eliloConfigType);
4051		if (!econfig)
4052		erc = 1;
4053		else
4054		erc = checkForElilo(econfig);
4055		}
4056
4057	if (!access(extlinuxConfigType.defaultConfig, F_OK)) {	if (!access(extlinuxConfigType.defaultConfig, F_OK)) {
4058	lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);	lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);
4059	if (!lconfig)	if (!lconfig)
4060	erc = 1;	extrc = 1;
4061	else	else
4062	erc = checkForExtLinux(lconfig);	extrc = checkForExtLinux(lconfig);
4063	}	}
4064
4065	if (lrc == 1 || grc == 1) return 1;
4066		if (!access(yabootConfigType.defaultConfig, F_OK)) {
4067		yconfig = readConfig(yabootConfigType.defaultConfig,
4068		&yabootConfigType);
4069		if (!yconfig)
4070		yrc = 1;
4071		else
4072		yrc = checkForYaboot(yconfig);
4073		}
4074
4075		if (lrc == 1 || grc == 1 || gr2c == 1 || extrc == 1 || yrc == 1 ||
4076		erc == 1)
4077		return 1;
4078
4079	if (lrc == 2) printf("lilo\n");	if (lrc == 2) printf("lilo\n");
4080		if (gr2c == 2) printf("grub2\n");
4081	if (grc == 2) printf("grub\n");	if (grc == 2) printf("grub\n");
4082	if (erc == 2) printf("extlinux\n");	if (extrc == 2) printf("extlinux\n");
4083		if (yrc == 2) printf("yaboot\n");
4084		if (erc == 2) printf("elilo\n");
4085
4086	return 0;	return 0;
4087	}	}
#	Line 3179  int main(int argc, const char ** argv) {	Line 4107  int main(int argc, const char ** argv) {
4107	((rootspec != NULL) ? strlen(rootspec) : 0));	((rootspec != NULL) ? strlen(rootspec) : 0));
4108
4109	return 0;	return 0;
4110
4111		} else if (displayDefaultTitle) {
4112		struct singleLine * line;
4113		struct singleEntry * entry;
4114
4115		if (config->defaultImage == -1) return 0;
4116		entry = findEntryByIndex(config, config->defaultImage);
4117		if (!entry) return 0;
4118
4119		if (!configureGrub2) {
4120		line = getLineByType(LT_TITLE, entry->lines);
4121		if (!line) return 0;
4122		printf("%s\n", line->elements[1].item);
4123
4124		} else {
4125		char * title;
4126
4127		dbgPrintf("This is GRUB2, default title is embeded in menuentry\n");
4128		line = getLineByType(LT_MENUENTRY, entry->lines);
4129		if (!line) return 0;
4130		title = grub2ExtractTitle(line);
4131		if (title)
4132		printf("%s\n", title);
4133		}
4134		return 0;
4135
4136		} else if (displayDefaultIndex) {
4137		if (config->defaultImage == -1) return 0;
4138		printf("%i\n", config->defaultImage);
4139
4140	} else if (kernelInfo)	} else if (kernelInfo)
4141	return displayInfo(config, kernelInfo, bootPrefix);	return displayInfo(config, kernelInfo, bootPrefix);
4142
#	Line 3190  int main(int argc, const char ** argv) {	Line 4148  int main(int argc, const char ** argv) {
4148	markRemovedImage(config, removeKernelPath, bootPrefix);	markRemovedImage(config, removeKernelPath, bootPrefix);
4149	markRemovedImage(config, removeMBKernel, bootPrefix);	markRemovedImage(config, removeMBKernel, bootPrefix);
4150	setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,	setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,
4151	bootPrefix, flags);	bootPrefix, flags, defaultIndex);
4152	setFallbackImage(config, newKernelPath != NULL);	setFallbackImage(config, newKernelPath != NULL);
4153	if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,	if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
4154	removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;	removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
#	Line 3200  int main(int argc, const char ** argv) {	Line 4158  int main(int argc, const char ** argv) {
4158	}	}
4159	if (addNewKernel(config, template, bootPrefix, newKernelPath,	if (addNewKernel(config, template, bootPrefix, newKernelPath,
4160	newKernelTitle, newKernelArgs, newKernelInitrd,	newKernelTitle, newKernelArgs, newKernelInitrd,
4161	extraInitrds, extraInitrdCount,	(const char **)extraInitrds, extraInitrdCount,
4162	newMBKernel, newMBKernelArgs)) return 1;	newMBKernel, newMBKernelArgs)) return 1;
4163
4164
#	Line 3211  int main(int argc, const char ** argv) {	Line 4169  int main(int argc, const char ** argv) {
4169	}	}
4170
4171	if (!outputFile)	if (!outputFile)
4172	outputFile = grubConfig;	outputFile = (char *)grubConfig;
4173
4174	return writeConfig(config, outputFile, bootPrefix);	return writeConfig(config, outputFile, bootPrefix);
4175	}	}

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.1177   changed lines   Added in v.1864