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

Diff of /trunk/grubby/grubby.c

Parent Directory | Revision Log | View Patch Patch

-revision 1850 by niro,
Mon Jul  2 13:09:12 2012 UTC
+revision 1859 by niro,
Mon Jul  2 13:15:20 2012 UTC
 Line 164 
 struct keywordTypes grubKeywords[] = {
  const char *grubFindConfig(struct configFileInfo *cfi) {
      static const char *configFiles[] = {
- 	"/etc/grub.conf",
  	"/boot/grub/grub.conf",
  	"/boot/grub/menu.lst",
+ 	"/etc/grub.conf",
  	NULL
      };
      static int i = -1;
 Line 1867 
 void markRemovedImage(struct grubConfig
  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)) {
-Line 2350 
 void dumpSysconfigGrub(void) {
+Line 2356 
 void dumpSysconfigGrub(void) {
      char * boot = NULL;
      int lba;
-     if (!isSuseSystem()) {
+     if (isSuseSystem()) {
-         if (parseSysconfigGrub(&lba, &boot)) {
+         if (parseSuseGrubConf(&lba, &boot)) {
  	    free(boot);
  	    return;
  	}
      } else {
-         if (parseSuseGrubConf(&lba, &boot)) {
+         if (parseSysconfigGrub(&lba, &boot)) {
  	    free(boot);
  	    return;
  	}
-Line 3179 
 int checkForGrub(struct grubConfig * con
+Line 3185 
 int checkForGrub(struct grubConfig * con
      int fd;
      unsigned char bootSect[512];
      char * boot;
-     int onSuse;
+     int onSuse = isSuseSystem();
-     onSuse = isSuseSystem();
-     if (!onSuse) {
+     if (onSuse) {
- 	if (parseSysconfigGrub(NULL, &boot)) return 0;
+ 	if (parseSuseGrubConf(NULL, &boot))
+ 	    return 0;
      } else {
- 	if (parseSuseGrubConf(NULL, &boot)) return 0;
+ 	if (parseSysconfigGrub(NULL, &boot))
+ 	    return 0;
      }
      /* assume grub is not installed -- not an error condition */
-Line 3205 
 int checkForGrub(struct grubConfig * con
+Line 3213 
 int checkForGrub(struct grubConfig * con
      }
      close(fd);
-     if (!onSuse)
+     /* The more elaborate checks do not work on SuSE. The checks done
- 	return checkDeviceBootloader(boot, bootSect);
+      * seem to be reasonble (at least for now), so just return success
-     else
+      */
- 	/*
+     if (onSuse)
- 	 * The more elaborate checks do not work on SuSE. The checks done
- 	 * seem to be reasonble (at least for now), so just return success
- 	 */
  	return 2;
+     return checkDeviceBootloader(boot, bootSect);
  }
  int checkForExtLinux(struct grubConfig * config) {
-Line 3245 
 int checkForExtLinux(struct grubConfig *
+Line 3252 
 int checkForExtLinux(struct grubConfig *
      return checkDeviceBootloader(boot, bootSect);
  }
+ int checkForYaboot(struct grubConfig * config) {
+     /*
+      * This is a simplistic check that we consider good enough for own puporses
+      *
+      * If we were to properly check if yaboot is *installed* we'd need to:
+      * 1) get the system boot device (LT_BOOT)
+      * 2) considering it's a raw filesystem, check if the yaboot binary matches
+      *    the content on the boot device
+      * 3) if not, copy the binary to a temporary file and run "addnote" on it
+      * 4) check again if binary and boot device contents match
+      */
+     if (!access("/etc/yaboot.conf", R_OK))
+ 	return 2;
+     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;
-Line 3715 
 int main(int argc, const char ** argv) {
+Line 3746 
 int main(int argc, const char ** argv) {
      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") },
-Line 3732 
 int main(int argc, const char ** argv) {
+Line 3764 
 int main(int argc, const char ** argv) {
  	{ "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
  	    _("filestystem which contains /boot directory (for testing only)"),
  	    _("bootfs") },
- #if defined(__i386__) || defined(__x86_64__)
+ #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
  	{ "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
- 	    _("check if lilo is installed on lilo.conf boot sector") },
+ 	    _("check which bootloader is installed on boot sector") },
  #endif
  	{ "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,
  	    _("path to grub config file to update (\"-\" for stdin)"),
-Line 3787 
 int main(int argc, const char ** argv) {
+Line 3819 
 int main(int argc, const char ** argv) {
  	{ "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,
-Line 3895 
 int main(int argc, const char ** argv) {
+Line 3930 
 int main(int argc, const char ** argv) {
      }
      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||
- 			  newKernelPath || removeKernelPath || makeDefault ||
+ 			    newKernelPath || removeKernelPath || makeDefault ||
- 			  defaultKernel || displayDefaultIndex || displayDefaultTitle)) {
+ 			    defaultKernel || displayDefaultIndex || displayDefaultTitle ||
+ 			    (defaultIndex >= 0))) {
  	fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
  			  "specified option"));
  	return 1;
-Line 3938 
 int main(int argc, const char ** argv) {
+Line 3974 
 int main(int argc, const char ** argv) {
  	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 "
-Line 3946 
 int main(int argc, const char ** argv) {
+Line 3987 
 int main(int argc, const char ** argv) {
      }
      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
  	&& !kernelInfo && !bootloaderProbe && !updateKernelPath
-         && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle) {
+ 	&& !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle
+ 	&& (defaultIndex == -1)) {
  	fprintf(stderr, _("grubby: no action specified\n"));
  	return 1;
      }
-Line 3974 
 int main(int argc, const char ** argv) {
+Line 4016 
 int main(int argc, const char ** argv) {
      }
      if (bootloaderProbe) {
- 	int lrc = 0, grc = 0, gr2c = 0, erc = 0;
+ 	int lrc = 0, grc = 0, gr2c = 0, extrc = 0, yrc = 0, erc = 0;
- 	struct grubConfig * lconfig, * gconfig;
+ 	struct grubConfig * lconfig, * gconfig, * yconfig, * econfig;
  	const char *grub2config = grub2FindConfig(&grub2ConfigType);
  	if (grub2config) {
-Line 4003 
 int main(int argc, const char ** argv) {
+Line 4045 
 int main(int argc, const char ** argv) {
  		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);
  	}
- 	if (lrc == 1 || grc == 1 || gr2c == 1) return 1;
+ 	if (!access(yabootConfigType.defaultConfig, F_OK)) {
+ 	    yconfig = readConfig(yabootConfigType.defaultConfig,
+ 				 &yabootConfigType);
+ 	    if (!yconfig)
+ 		yrc = 1;
+ 	    else
+ 		yrc = checkForYaboot(lconfig);
+ 	}
+ 	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;
      }
-Line 4083 
 int main(int argc, const char ** argv) {
+Line 4148 
 int main(int argc, const char ** argv) {
      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;

 Legend:



Removed from v.1850
 


changed lines


 
Added in v.1859
 Legend:



Removed from v.1850
 


changed lines


 
Added in v.1859
-Removed from v.1850
+Added in v.1859