--- trunk/grubby/grubby.c	2012/07/02 13:12:07	1853
+++ trunk/grubby/grubby.c	2012/07/02 13:20:31	1864
@@ -1867,13 +1867,19 @@
 
 void setDefaultImage(struct grubConfig * config, int hasNew, 
 		     const char * defaultKernelPath, int newIsDefault,
-		     const char * prefix, int flags) {
+		     const char * prefix, int flags, int index) {
     struct singleEntry * entry, * entry2, * newDefault;
     int i, j;
 
     if (newIsDefault) {
 	config->defaultImage = 0;
 	return;
+    } else if ((index >= 0) && config->cfi->defaultIsIndex) {
+	if (findEntryByIndex(config, index))
+	    config->defaultImage = index;
+	else
+	    config->defaultImage = -1;
+	return;
     } else if (defaultKernelPath) {
 	i = 0;
 	if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {
@@ -3263,6 +3269,13 @@
     return 1;
 }
 
+int checkForElilo(struct grubConfig * config) {
+    if (!access("/etc/elilo.conf", R_OK))
+	return 2;
+
+    return 1;
+}
+
 static char * getRootSpecifier(char * str) {
     char * idx, * rootspec = NULL;
 
@@ -3733,6 +3746,7 @@
     int displayDefault = 0;
     int displayDefaultIndex = 0;
     int displayDefaultTitle = 0;
+    int defaultIndex = -1;
     struct poptOption options[] = {
 	{ "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,
 	    _("add an entry for the specified kernel"), _("kernel-path") },
@@ -3750,7 +3764,7 @@
 	{ "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
 	    _("filestystem which contains /boot directory (for testing only)"),
 	    _("bootfs") },
-#if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__)
+#if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
 	{ "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
 	    _("check which bootloader is installed on boot sector") },
 #endif
@@ -3805,6 +3819,9 @@
 	{ "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,
 	    _("make the first entry referencing the specified kernel "
 	      "the default"), _("kernel-path") },
+	{ "set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,
+	    _("make the given entry index the default entry"),
+	    _("entry-index") },
 	{ "silo", 0, POPT_ARG_NONE, &configureSilo, 0,
 	    _("configure silo bootloader") },
 	{ "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,
@@ -3913,8 +3930,9 @@
     }
 
     if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||
-			  newKernelPath || removeKernelPath || makeDefault ||
-			  defaultKernel || displayDefaultIndex || displayDefaultTitle)) {
+			    newKernelPath || removeKernelPath || makeDefault ||
+			    defaultKernel || displayDefaultIndex || displayDefaultTitle ||
+			    (defaultIndex >= 0))) {
 	fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
 			  "specified option"));
 	return 1;
@@ -3956,6 +3974,11 @@
 	makeDefault = 1;
 	defaultKernel = NULL;
     }
+    else if (defaultKernel && (defaultIndex >= 0)) {
+	fprintf(stderr, _("grubby: --set-default and --set-default-index "
+			  "may not be used together\n"));
+	return 1;
+    }
 
     if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {
 	fprintf(stderr, _("grubby: output file must be specified if stdin "
@@ -3964,8 +3987,9 @@
     }
 
     if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
-	&& !kernelInfo && !bootloaderProbe && !updateKernelPath 
-        && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle) {
+	&& !kernelInfo && !bootloaderProbe && !updateKernelPath
+	&& !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle
+	&& (defaultIndex == -1)) {
 	fprintf(stderr, _("grubby: no action specified\n"));
 	return 1;
     }
@@ -3992,8 +4016,8 @@
     }
 
     if (bootloaderProbe) {
-	int lrc = 0, grc = 0, gr2c = 0, erc = 0, yrc = 0;
-	struct grubConfig * lconfig, * gconfig, * yconfig;
+	int lrc = 0, grc = 0, gr2c = 0, extrc = 0, yrc = 0, erc = 0;
+	struct grubConfig * lconfig, * gconfig, * yconfig, * econfig;
 
 	const char *grub2config = grub2FindConfig(&grub2ConfigType);
 	if (grub2config) {
@@ -4021,12 +4045,21 @@
 		lrc = checkForLilo(lconfig);
 	} 
 
+	if (!access(eliloConfigType.defaultConfig, F_OK)) {
+	    econfig = readConfig(eliloConfigType.defaultConfig,
+				 &eliloConfigType);
+	    if (!econfig)
+		erc = 1;
+	    else
+		erc = checkForElilo(econfig);
+	}
+
 	if (!access(extlinuxConfigType.defaultConfig, F_OK)) {
 	    lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);
 	    if (!lconfig)
-		erc = 1;
+		extrc = 1;
 	    else
-		erc = checkForExtLinux(lconfig);
+		extrc = checkForExtLinux(lconfig);
 	} 
 
 
@@ -4036,16 +4069,19 @@
 	    if (!yconfig)
 		yrc = 1;
 	    else
-	      yrc = checkForYaboot(lconfig);
+		yrc = checkForYaboot(yconfig);
 	}
 
-	if (lrc == 1 || grc == 1 || gr2c == 1 || yrc == 1) return 1;
+	if (lrc == 1 || grc == 1 || gr2c == 1 || extrc == 1 || yrc == 1 ||
+		erc == 1)
+	    return 1;
 
 	if (lrc == 2) printf("lilo\n");
 	if (gr2c == 2) printf("grub2\n");
 	if (grc == 2) printf("grub\n");
-	if (erc == 2) printf("extlinux\n");
+	if (extrc == 2) printf("extlinux\n");
 	if (yrc == 2) printf("yaboot\n");
+	if (erc == 2) printf("elilo\n");
 
 	return 0;
     }
@@ -4112,7 +4148,7 @@
     markRemovedImage(config, removeKernelPath, bootPrefix);
     markRemovedImage(config, removeMBKernel, bootPrefix);
     setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault, 
-		    bootPrefix, flags);
+		    bootPrefix, flags, defaultIndex);
     setFallbackImage(config, newKernelPath != NULL);
     if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
                     removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;