Magellan Linux

  • Back to homepage
    • /[magellan-source]/tags/grubby-8_21/grubby.c

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

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1850 by niro, Mon Jul 2 13:09:12 2012 UTC revision 1934 by niro, Mon Oct 1 12:08:46 2012 UTC
    # Line 164  struct keywordTypes grubKeywords[] = { Line 164  struct keywordTypes grubKeywords[] = {
    164    
    165  const char *grubFindConfig(struct configFileInfo *cfi) {  const char *grubFindConfig(struct configFileInfo *cfi) {
    166      static const char *configFiles[] = {      static const char *configFiles[] = {
      "/etc/grub.conf",  
    167   "/boot/grub/grub.conf",   "/boot/grub/grub.conf",
    168   "/boot/grub/menu.lst",   "/boot/grub/menu.lst",
    169     "/etc/grub.conf",
    170   NULL   NULL
    171      };      };
    172      static int i = -1;      static int i = -1;
    # Line 205  struct keywordTypes grub2Keywords[] = { Line 205  struct keywordTypes grub2Keywords[] = {
    205      { "default",    LT_DEFAULT,     ' ' },      { "default",    LT_DEFAULT,     ' ' },
    206      { "fallback",   LT_FALLBACK,    ' ' },      { "fallback",   LT_FALLBACK,    ' ' },
    207      { "linux",      LT_KERNEL,      ' ' },      { "linux",      LT_KERNEL,      ' ' },
    208        { "linuxefi",   LT_KERNEL,      ' ' },
    209      { "initrd",     LT_INITRD,      ' ', ' ' },      { "initrd",     LT_INITRD,      ' ', ' ' },
    210        { "initrdefi",  LT_INITRD,      ' ', ' ' },
    211      { "module",     LT_MBMODULE,    ' ' },      { "module",     LT_MBMODULE,    ' ' },
    212      { "kernel",     LT_HYPER,       ' ' },      { "kernel",     LT_HYPER,       ' ' },
    213      { NULL, 0, 0 },      { NULL, 0, 0 },
    # Line 1310  static int writeConfig(struct grubConfig Line 1312  static int writeConfig(struct grubConfig
    1312    
    1313      /* most likely the symlink is relative, so change our      /* most likely the symlink is relative, so change our
    1314         directory to the dir of the symlink */         directory to the dir of the symlink */
    1315              rc = chdir(dirname(outName));      char *dir = strdupa(outName);
    1316        rc = chdir(dirname(dir));
    1317      do {      do {
    1318   buf = alloca(len + 1);   buf = alloca(len + 1);
    1319   rc = readlink(basename(outName), buf, len);   rc = readlink(basename(outName), buf, len);
    # Line 1867  void markRemovedImage(struct grubConfig Line 1870  void markRemovedImage(struct grubConfig
    1870    
    1871  void setDefaultImage(struct grubConfig * config, int hasNew,  void setDefaultImage(struct grubConfig * config, int hasNew,
    1872       const char * defaultKernelPath, int newIsDefault,       const char * defaultKernelPath, int newIsDefault,
    1873       const char * prefix, int flags) {       const char * prefix, int flags, int index) {
    1874      struct singleEntry * entry, * entry2, * newDefault;      struct singleEntry * entry, * entry2, * newDefault;
    1875      int i, j;      int i, j;
    1876    
    1877      if (newIsDefault) {      if (newIsDefault) {
    1878   config->defaultImage = 0;   config->defaultImage = 0;
    1879   return;   return;
    1880        } else if ((index >= 0) && config->cfi->defaultIsIndex) {
    1881     if (findEntryByIndex(config, index))
    1882        config->defaultImage = index;
    1883     else
    1884        config->defaultImage = -1;
    1885     return;
    1886      } else if (defaultKernelPath) {      } else if (defaultKernelPath) {
    1887   i = 0;   i = 0;
    1888   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {
    # Line 2350  void dumpSysconfigGrub(void) { Line 2359  void dumpSysconfigGrub(void) {
    2359      char * boot = NULL;      char * boot = NULL;
    2360      int lba;      int lba;
    2361    
    2362      if (!isSuseSystem()) {      if (isSuseSystem()) {
    2363          if (parseSysconfigGrub(&lba, &boot)) {          if (parseSuseGrubConf(&lba, &boot)) {
    2364      free(boot);      free(boot);
    2365      return;      return;
    2366   }   }
    2367      } else {      } else {
    2368          if (parseSuseGrubConf(&lba, &boot)) {          if (parseSysconfigGrub(&lba, &boot)) {
    2369      free(boot);      free(boot);
    2370      return;      return;
    2371   }   }
    # Line 3179  int checkForGrub(struct grubConfig * con Line 3188  int checkForGrub(struct grubConfig * con
    3188      int fd;      int fd;
    3189      unsigned char bootSect[512];      unsigned char bootSect[512];
    3190      char * boot;      char * boot;
    3191      int onSuse;      int onSuse = isSuseSystem();
    3192    
    3193      onSuse = isSuseSystem();  
    3194      if (!onSuse) {      if (onSuse) {
    3195   if (parseSysconfigGrub(NULL, &boot)) return 0;   if (parseSuseGrubConf(NULL, &boot))
    3196        return 0;
    3197      } else {      } else {
    3198   if (parseSuseGrubConf(NULL, &boot)) return 0;   if (parseSysconfigGrub(NULL, &boot))
    3199        return 0;
    3200      }      }
    3201    
    3202      /* assume grub is not installed -- not an error condition */      /* assume grub is not installed -- not an error condition */
    # Line 3205  int checkForGrub(struct grubConfig * con Line 3216  int checkForGrub(struct grubConfig * con
    3216      }      }
    3217      close(fd);      close(fd);
    3218    
    3219      if (!onSuse)      /* The more elaborate checks do not work on SuSE. The checks done
    3220   return checkDeviceBootloader(boot, bootSect);       * seem to be reasonble (at least for now), so just return success
    3221      else       */
    3222   /*      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  
      */  
    3223   return 2;   return 2;
    3224    
    3225        return checkDeviceBootloader(boot, bootSect);
    3226  }  }
    3227    
    3228  int checkForExtLinux(struct grubConfig * config) {  int checkForExtLinux(struct grubConfig * config) {
    # Line 3245  int checkForExtLinux(struct grubConfig * Line 3255  int checkForExtLinux(struct grubConfig *
    3255      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
    3256  }  }
    3257    
    3258    int checkForYaboot(struct grubConfig * config) {
    3259        /*
    3260         * This is a simplistic check that we consider good enough for own puporses
    3261         *
    3262         * If we were to properly check if yaboot is *installed* we'd need to:
    3263         * 1) get the system boot device (LT_BOOT)
    3264         * 2) considering it's a raw filesystem, check if the yaboot binary matches
    3265         *    the content on the boot device
    3266         * 3) if not, copy the binary to a temporary file and run "addnote" on it
    3267         * 4) check again if binary and boot device contents match
    3268         */
    3269        if (!access("/etc/yaboot.conf", R_OK))
    3270     return 2;
    3271    
    3272        return 1;
    3273    }
    3274    
    3275    int checkForElilo(struct grubConfig * config) {
    3276        if (!access("/etc/elilo.conf", R_OK))
    3277     return 2;
    3278    
    3279        return 1;
    3280    }
    3281    
    3282  static char * getRootSpecifier(char * str) {  static char * getRootSpecifier(char * str) {
    3283      char * idx, * rootspec = NULL;      char * idx, * rootspec = NULL;
    3284    
    # Line 3715  int main(int argc, const char ** argv) { Line 3749  int main(int argc, const char ** argv) {
    3749      int displayDefault = 0;      int displayDefault = 0;
    3750      int displayDefaultIndex = 0;      int displayDefaultIndex = 0;
    3751      int displayDefaultTitle = 0;      int displayDefaultTitle = 0;
    3752        int defaultIndex = -1;
    3753      struct poptOption options[] = {      struct poptOption options[] = {
    3754   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,
    3755      _("add an entry for the specified kernel"), _("kernel-path") },      _("add an entry for the specified kernel"), _("kernel-path") },
    # Line 3732  int main(int argc, const char ** argv) { Line 3767  int main(int argc, const char ** argv) {
    3767   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
    3768      _("filestystem which contains /boot directory (for testing only)"),      _("filestystem which contains /boot directory (for testing only)"),
    3769      _("bootfs") },      _("bootfs") },
    3770  #if defined(__i386__) || defined(__x86_64__)  #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
    3771   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
    3772      _("check if lilo is installed on lilo.conf boot sector") },      _("check which bootloader is installed on boot sector") },
    3773  #endif  #endif
    3774   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,
    3775      _("path to grub config file to update (\"-\" for stdin)"),      _("path to grub config file to update (\"-\" for stdin)"),
    # Line 3787  int main(int argc, const char ** argv) { Line 3822  int main(int argc, const char ** argv) {
    3822   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,
    3823      _("make the first entry referencing the specified kernel "      _("make the first entry referencing the specified kernel "
    3824        "the default"), _("kernel-path") },        "the default"), _("kernel-path") },
    3825     { "set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,
    3826        _("make the given entry index the default entry"),
    3827        _("entry-index") },
    3828   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,
    3829      _("configure silo bootloader") },      _("configure silo bootloader") },
    3830   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,
    # Line 3895  int main(int argc, const char ** argv) { Line 3933  int main(int argc, const char ** argv) {
    3933      }      }
    3934    
    3935      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||
    3936    newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
    3937    defaultKernel || displayDefaultIndex || displayDefaultTitle)) {      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
    3938        (defaultIndex >= 0))) {
    3939   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
    3940    "specified option"));    "specified option"));
    3941   return 1;   return 1;
    # Line 3938  int main(int argc, const char ** argv) { Line 3977  int main(int argc, const char ** argv) {
    3977   makeDefault = 1;   makeDefault = 1;
    3978   defaultKernel = NULL;   defaultKernel = NULL;
    3979      }      }
    3980        else if (defaultKernel && (defaultIndex >= 0)) {
    3981     fprintf(stderr, _("grubby: --set-default and --set-default-index "
    3982      "may not be used together\n"));
    3983     return 1;
    3984        }
    3985    
    3986      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {
    3987   fprintf(stderr, _("grubby: output file must be specified if stdin "   fprintf(stderr, _("grubby: output file must be specified if stdin "
    # Line 3946  int main(int argc, const char ** argv) { Line 3990  int main(int argc, const char ** argv) {
    3990      }      }
    3991    
    3992      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
    3993   && !kernelInfo && !bootloaderProbe && !updateKernelPath   && !kernelInfo && !bootloaderProbe && !updateKernelPath
    3994          && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle) {   && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle
    3995     && (defaultIndex == -1)) {
    3996   fprintf(stderr, _("grubby: no action specified\n"));   fprintf(stderr, _("grubby: no action specified\n"));
    3997   return 1;   return 1;
    3998      }      }
    # Line 3974  int main(int argc, const char ** argv) { Line 4019  int main(int argc, const char ** argv) {
    4019      }      }
    4020    
    4021      if (bootloaderProbe) {      if (bootloaderProbe) {
    4022   int lrc = 0, grc = 0, gr2c = 0, erc = 0;   int lrc = 0, grc = 0, gr2c = 0, extrc = 0, yrc = 0, erc = 0;
    4023   struct grubConfig * lconfig, * gconfig;   struct grubConfig * lconfig, * gconfig, * yconfig, * econfig;
    4024    
    4025   const char *grub2config = grub2FindConfig(&grub2ConfigType);   const char *grub2config = grub2FindConfig(&grub2ConfigType);
    4026   if (grub2config) {   if (grub2config) {
    # Line 4003  int main(int argc, const char ** argv) { Line 4048  int main(int argc, const char ** argv) {
    4048   lrc = checkForLilo(lconfig);   lrc = checkForLilo(lconfig);
    4049   }   }
    4050    
    4051     if (!access(eliloConfigType.defaultConfig, F_OK)) {
    4052        econfig = readConfig(eliloConfigType.defaultConfig,
    4053     &eliloConfigType);
    4054        if (!econfig)
    4055     erc = 1;
    4056        else
    4057     erc = checkForElilo(econfig);
    4058     }
    4059    
    4060   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {
    4061      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);
    4062      if (!lconfig)      if (!lconfig)
    4063   erc = 1;   extrc = 1;
    4064      else      else
    4065   erc = checkForExtLinux(lconfig);   extrc = checkForExtLinux(lconfig);
    4066   }   }
    4067    
    4068   if (lrc == 1 || grc == 1 || gr2c == 1) return 1;  
    4069     if (!access(yabootConfigType.defaultConfig, F_OK)) {
    4070        yconfig = readConfig(yabootConfigType.defaultConfig,
    4071     &yabootConfigType);
    4072        if (!yconfig)
    4073     yrc = 1;
    4074        else
    4075     yrc = checkForYaboot(yconfig);
    4076     }
    4077    
    4078     if (lrc == 1 || grc == 1 || gr2c == 1 || extrc == 1 || yrc == 1 ||
    4079     erc == 1)
    4080        return 1;
    4081    
    4082   if (lrc == 2) printf("lilo\n");   if (lrc == 2) printf("lilo\n");
    4083   if (gr2c == 2) printf("grub2\n");   if (gr2c == 2) printf("grub2\n");
    4084   if (grc == 2) printf("grub\n");   if (grc == 2) printf("grub\n");
    4085   if (erc == 2) printf("extlinux\n");   if (extrc == 2) printf("extlinux\n");
    4086     if (yrc == 2) printf("yaboot\n");
    4087     if (erc == 2) printf("elilo\n");
    4088    
    4089   return 0;   return 0;
    4090      }      }
    # Line 4083  int main(int argc, const char ** argv) { Line 4151  int main(int argc, const char ** argv) {
    4151      markRemovedImage(config, removeKernelPath, bootPrefix);      markRemovedImage(config, removeKernelPath, bootPrefix);
    4152      markRemovedImage(config, removeMBKernel, bootPrefix);      markRemovedImage(config, removeMBKernel, bootPrefix);
    4153      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,
    4154      bootPrefix, flags);      bootPrefix, flags, defaultIndex);
    4155      setFallbackImage(config, newKernelPath != NULL);      setFallbackImage(config, newKernelPath != NULL);
    4156      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
    4157                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
    Legend:
    Removed from v.1850  
    changed lines
      Added in v.1934