Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/grubby/grubby.c

    Diff of /trunk/grubby/grubby.c

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

    revision 1853 by niro, Mon Jul 2 13:12:07 2012 UTC revision 1868 by niro, Mon Jul 2 13:22:30 2012 UTC
    # Line 1310  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(outName));      char *dir = strdupa(outName);
    1314                rc = chdir(dirname(dir));
    1315        free(dir);
    1316      do {      do {
    1317   buf = alloca(len + 1);   buf = alloca(len + 1);
    1318   rc = readlink(basename(outName), buf, len);   rc = readlink(basename(outName), buf, len);
    # Line 1867  void markRemovedImage(struct grubConfig Line 1869  void markRemovedImage(struct grubConfig
    1869    
    1870  void setDefaultImage(struct grubConfig * config, int hasNew,  void setDefaultImage(struct grubConfig * config, int hasNew,
    1871       const char * defaultKernelPath, int newIsDefault,       const char * defaultKernelPath, int newIsDefault,
    1872       const char * prefix, int flags) {       const char * prefix, int flags, int index) {
    1873      struct singleEntry * entry, * entry2, * newDefault;      struct singleEntry * entry, * entry2, * newDefault;
    1874      int i, j;      int i, j;
    1875    
    1876      if (newIsDefault) {      if (newIsDefault) {
    1877   config->defaultImage = 0;   config->defaultImage = 0;
    1878   return;   return;
    1879        } else if ((index >= 0) && config->cfi->defaultIsIndex) {
    1880     if (findEntryByIndex(config, index))
    1881        config->defaultImage = index;
    1882     else
    1883        config->defaultImage = -1;
    1884     return;
    1885      } else if (defaultKernelPath) {      } else if (defaultKernelPath) {
    1886   i = 0;   i = 0;
    1887   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {
    # Line 3263  int checkForYaboot(struct grubConfig * c Line 3271  int checkForYaboot(struct grubConfig * c
    3271      return 1;      return 1;
    3272  }  }
    3273    
    3274    int checkForElilo(struct grubConfig * config) {
    3275        if (!access("/etc/elilo.conf", R_OK))
    3276     return 2;
    3277    
    3278        return 1;
    3279    }
    3280    
    3281  static char * getRootSpecifier(char * str) {  static char * getRootSpecifier(char * str) {
    3282      char * idx, * rootspec = NULL;      char * idx, * rootspec = NULL;
    3283    
    # Line 3733  int main(int argc, const char ** argv) { Line 3748  int main(int argc, const char ** argv) {
    3748      int displayDefault = 0;      int displayDefault = 0;
    3749      int displayDefaultIndex = 0;      int displayDefaultIndex = 0;
    3750      int displayDefaultTitle = 0;      int displayDefaultTitle = 0;
    3751        int defaultIndex = -1;
    3752      struct poptOption options[] = {      struct poptOption options[] = {
    3753   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,
    3754      _("add an entry for the specified kernel"), _("kernel-path") },      _("add an entry for the specified kernel"), _("kernel-path") },
    # Line 3750  int main(int argc, const char ** argv) { Line 3766  int main(int argc, const char ** argv) {
    3766   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
    3767      _("filestystem which contains /boot directory (for testing only)"),      _("filestystem which contains /boot directory (for testing only)"),
    3768      _("bootfs") },      _("bootfs") },
    3769  #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__)  #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
    3770   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
    3771      _("check which bootloader is installed on boot sector") },      _("check which bootloader is installed on boot sector") },
    3772  #endif  #endif
    # Line 3805  int main(int argc, const char ** argv) { Line 3821  int main(int argc, const char ** argv) {
    3821   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,
    3822      _("make the first entry referencing the specified kernel "      _("make the first entry referencing the specified kernel "
    3823        "the default"), _("kernel-path") },        "the default"), _("kernel-path") },
    3824     { "set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,
    3825        _("make the given entry index the default entry"),
    3826        _("entry-index") },
    3827   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,
    3828      _("configure silo bootloader") },      _("configure silo bootloader") },
    3829   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,
    # Line 3913  int main(int argc, const char ** argv) { Line 3932  int main(int argc, const char ** argv) {
    3932      }      }
    3933    
    3934      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||
    3935    newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
    3936    defaultKernel || displayDefaultIndex || displayDefaultTitle)) {      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
    3937        (defaultIndex >= 0))) {
    3938   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
    3939    "specified option"));    "specified option"));
    3940   return 1;   return 1;
    # Line 3956  int main(int argc, const char ** argv) { Line 3976  int main(int argc, const char ** argv) {
    3976   makeDefault = 1;   makeDefault = 1;
    3977   defaultKernel = NULL;   defaultKernel = NULL;
    3978      }      }
    3979        else if (defaultKernel && (defaultIndex >= 0)) {
    3980     fprintf(stderr, _("grubby: --set-default and --set-default-index "
    3981      "may not be used together\n"));
    3982     return 1;
    3983        }
    3984    
    3985      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {
    3986   fprintf(stderr, _("grubby: output file must be specified if stdin "   fprintf(stderr, _("grubby: output file must be specified if stdin "
    # Line 3964  int main(int argc, const char ** argv) { Line 3989  int main(int argc, const char ** argv) {
    3989      }      }
    3990    
    3991      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
    3992   && !kernelInfo && !bootloaderProbe && !updateKernelPath   && !kernelInfo && !bootloaderProbe && !updateKernelPath
    3993          && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle) {   && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle
    3994     && (defaultIndex == -1)) {
    3995   fprintf(stderr, _("grubby: no action specified\n"));   fprintf(stderr, _("grubby: no action specified\n"));
    3996   return 1;   return 1;
    3997      }      }
    # Line 3992  int main(int argc, const char ** argv) { Line 4018  int main(int argc, const char ** argv) {
    4018      }      }
    4019    
    4020      if (bootloaderProbe) {      if (bootloaderProbe) {
    4021   int lrc = 0, grc = 0, gr2c = 0, erc = 0, yrc = 0;   int lrc = 0, grc = 0, gr2c = 0, extrc = 0, yrc = 0, erc = 0;
    4022   struct grubConfig * lconfig, * gconfig, * yconfig;   struct grubConfig * lconfig, * gconfig, * yconfig, * econfig;
    4023    
    4024   const char *grub2config = grub2FindConfig(&grub2ConfigType);   const char *grub2config = grub2FindConfig(&grub2ConfigType);
    4025   if (grub2config) {   if (grub2config) {
    # Line 4021  int main(int argc, const char ** argv) { Line 4047  int main(int argc, const char ** argv) {
    4047   lrc = checkForLilo(lconfig);   lrc = checkForLilo(lconfig);
    4048   }   }
    4049    
    4050     if (!access(eliloConfigType.defaultConfig, F_OK)) {
    4051        econfig = readConfig(eliloConfigType.defaultConfig,
    4052     &eliloConfigType);
    4053        if (!econfig)
    4054     erc = 1;
    4055        else
    4056     erc = checkForElilo(econfig);
    4057     }
    4058    
    4059   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {   if (!access(extlinuxConfigType.defaultConfig, F_OK)) {
    4060      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);      lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);
    4061      if (!lconfig)      if (!lconfig)
    4062   erc = 1;   extrc = 1;
    4063      else      else
    4064   erc = checkForExtLinux(lconfig);   extrc = checkForExtLinux(lconfig);
    4065   }   }
    4066    
    4067    
    # Line 4036  int main(int argc, const char ** argv) { Line 4071  int main(int argc, const char ** argv) {
    4071      if (!yconfig)      if (!yconfig)
    4072   yrc = 1;   yrc = 1;
    4073      else      else
    4074        yrc = checkForYaboot(lconfig);   yrc = checkForYaboot(yconfig);
    4075   }   }
    4076    
    4077   if (lrc == 1 || grc == 1 || gr2c == 1 || yrc == 1) return 1;   if (lrc == 1 || grc == 1 || gr2c == 1 || extrc == 1 || yrc == 1 ||
    4078     erc == 1)
    4079        return 1;
    4080    
    4081   if (lrc == 2) printf("lilo\n");   if (lrc == 2) printf("lilo\n");
    4082   if (gr2c == 2) printf("grub2\n");   if (gr2c == 2) printf("grub2\n");
    4083   if (grc == 2) printf("grub\n");   if (grc == 2) printf("grub\n");
    4084   if (erc == 2) printf("extlinux\n");   if (extrc == 2) printf("extlinux\n");
    4085   if (yrc == 2) printf("yaboot\n");   if (yrc == 2) printf("yaboot\n");
    4086     if (erc == 2) printf("elilo\n");
    4087    
    4088   return 0;   return 0;
    4089      }      }
    # Line 4112  int main(int argc, const char ** argv) { Line 4150  int main(int argc, const char ** argv) {
    4150      markRemovedImage(config, removeKernelPath, bootPrefix);      markRemovedImage(config, removeKernelPath, bootPrefix);
    4151      markRemovedImage(config, removeMBKernel, bootPrefix);      markRemovedImage(config, removeMBKernel, bootPrefix);
    4152      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,
    4153      bootPrefix, flags);      bootPrefix, flags, defaultIndex);
    4154      setFallbackImage(config, newKernelPath != NULL);      setFallbackImage(config, newKernelPath != NULL);
    4155      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
    4156                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
    Legend:
    Removed from v.1853  
    changed lines
      Added in v.1868