Magellan Linux

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

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

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

    revision 2257 by niro, Mon Oct 21 14:01:48 2013 UTC revision 2682 by niro, Wed Jul 16 09:49:24 2014 UTC
    # Line 182  const char *grubFindConfig(struct config Line 182  const char *grubFindConfig(struct config
    182   "/boot/grub/grub.conf",   "/boot/grub/grub.conf",
    183   "/boot/grub/menu.lst",   "/boot/grub/menu.lst",
    184   "/etc/grub.conf",   "/etc/grub.conf",
    185     "/boot/grub2/grub.cfg",
    186     "/boot/grub2-efi/grub.cfg",
    187   NULL   NULL
    188      };      };
    189      static int i = -1;      static int i = -1;
    # Line 273  static char *grub2GetEnv(struct configFi Line 275  static char *grub2GetEnv(struct configFi
    275      static char buf[1025];      static char buf[1025];
    276      char *s = NULL;      char *s = NULL;
    277      char *ret = NULL;      char *ret = NULL;
    278      char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv";      char *envFile = info->envFile ? info->envFile : "/boot/grub/grubenv";
    279      int rc = asprintf(&s, "grub2-editenv %s list | grep '^%s='", envFile, name);      int rc = asprintf(&s, "grub-editenv %s list | grep '^%s='", envFile, name);
    280    
    281      if (rc < 0)      if (rc < 0)
    282   return NULL;   return NULL;
    # Line 338  static int grub2SetEnv(struct configFile Line 340  static int grub2SetEnv(struct configFile
    340  {  {
    341      char *s = NULL;      char *s = NULL;
    342      int rc = 0;      int rc = 0;
    343      char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv";      char *envFile = info->envFile ? info->envFile : "/boot/grub/grubenv";
    344    
    345      unquote(value);      unquote(value);
    346      value = shellEscape(value);      value = shellEscape(value);
    347      if (!value)      if (!value)
    348      return -1;      return -1;
    349    
    350      rc = asprintf(&s, "grub2-editenv %s set '%s=%s'", envFile, name, value);      rc = asprintf(&s, "grub-editenv %s set '%s=%s'", envFile, name, value);
    351      free(value);      free(value);
    352      if (rc <0)      if (rc <0)
    353   return -1;   return -1;
    # Line 1066  static int getNextLine(char ** bufPtr, s Line 1068  static int getNextLine(char ** bufPtr, s
    1068      return 0;      return 0;
    1069  }  }
    1070    
    1071    static int isnumber(const char *s)
    1072    {
    1073        int i;
    1074        for (i = 0; s[i] != '\0'; i++)
    1075     if (s[i] < '0' || s[i] > '9')
    1076        return 0;
    1077        return i;
    1078    }
    1079    
    1080  static struct grubConfig * readConfig(const char * inName,  static struct grubConfig * readConfig(const char * inName,
    1081        struct configFileInfo * cfi) {        struct configFileInfo * cfi) {
    1082      int in;      int in;
    # Line 1362  static struct grubConfig * readConfig(co Line 1373  static struct grubConfig * readConfig(co
    1373      char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");      char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
    1374      if (defTitle) {      if (defTitle) {
    1375   int index = 0;   int index = 0;
    1376   entry = findEntryByTitle(cfg, defTitle, &index);   if (isnumber(defTitle)) {
    1377        index = atoi(defTitle);
    1378        entry = findEntryByIndex(cfg, index);
    1379     } else {
    1380        entry = findEntryByTitle(cfg, defTitle, &index);
    1381     }
    1382   if (entry)   if (entry)
    1383      cfg->defaultImage = index;      cfg->defaultImage = index;
    1384      }      }
    # Line 1411  static struct grubConfig * readConfig(co Line 1427  static struct grubConfig * readConfig(co
    1427   char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");   char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
    1428   if (defTitle) {   if (defTitle) {
    1429      int index = 0;      int index = 0;
    1430      entry = findEntryByTitle(cfg, defTitle, &index);      if (isnumber(defTitle)) {
    1431     index = atoi(defTitle);
    1432     entry = findEntryByIndex(cfg, index);
    1433        } else {
    1434     entry = findEntryByTitle(cfg, defTitle, &index);
    1435        }
    1436      if (entry)      if (entry)
    1437   cfg->defaultImage = index;   cfg->defaultImage = index;
    1438   }   }
    # Line 2062  struct singleEntry * findTemplate(struct Line 2083  struct singleEntry * findTemplate(struct
    2083      char *defTitle = cfg->cfi->getEnv(cfg->cfi, "saved_entry");      char *defTitle = cfg->cfi->getEnv(cfg->cfi, "saved_entry");
    2084      if (defTitle) {      if (defTitle) {
    2085   int index = 0;   int index = 0;
    2086   entry = findEntryByTitle(cfg, defTitle, &index);   if (isnumber(defTitle)) {
    2087        index = atoi(defTitle);
    2088        entry = findEntryByIndex(cfg, index);
    2089     } else {
    2090        entry = findEntryByTitle(cfg, defTitle, &index);
    2091     }
    2092     if (entry)
    2093        cfg->defaultImage = index;
    2094      }      }
    2095   }   }
    2096      } else if (cfg->defaultImage > -1) {      } else if (cfg->defaultImage > -1) {
    # Line 3230  int updateImage(struct grubConfig * cfg, Line 3258  int updateImage(struct grubConfig * cfg,
    3258      return rc;      return rc;
    3259  }  }
    3260    
    3261    int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
    3262     const char * image, const char * prefix, const char * initrd) {
    3263        struct singleEntry * entry;
    3264        struct singleLine * line, * kernelLine, *endLine = NULL;
    3265        int index = 0;
    3266    
    3267        if (!image) return 0;
    3268    
    3269        for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {
    3270            kernelLine = getLineByType(LT_MBMODULE, entry->lines);
    3271            if (!kernelLine) continue;
    3272    
    3273            if (prefix) {
    3274                int prefixLen = strlen(prefix);
    3275                if (!strncmp(initrd, prefix, prefixLen))
    3276                    initrd += prefixLen;
    3277            }
    3278     endLine = getLineByType(LT_ENTRY_END, entry->lines);
    3279     if (endLine)
    3280        removeLine(entry, endLine);
    3281            line = addLine(entry, cfg->cfi, preferredLineType(LT_MBMODULE,cfg->cfi),
    3282     kernelLine->indent, initrd);
    3283            if (!line)
    3284        return 1;
    3285     if (endLine) {
    3286        line = addLine(entry, cfg->cfi, LT_ENTRY_END, "", NULL);
    3287                if (!line)
    3288     return 1;
    3289     }
    3290    
    3291            break;
    3292        }
    3293    
    3294        return 0;
    3295    }
    3296    
    3297  int updateInitrd(struct grubConfig * cfg, const char * image,  int updateInitrd(struct grubConfig * cfg, const char * image,
    3298                   const char * prefix, const char * initrd) {                   const char * prefix, const char * initrd) {
    3299      struct singleEntry * entry;      struct singleEntry * entry;
    # Line 4471  int main(int argc, const char ** argv) { Line 4535  int main(int argc, const char ** argv) {
    4535      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
    4536                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
    4537      if (updateKernelPath && newKernelInitrd) {      if (updateKernelPath && newKernelInitrd) {
    4538              if (updateInitrd(config, updateKernelPath, bootPrefix,      if (newMBKernel) {
    4539                               newKernelInitrd)) return 1;      if (addMBInitrd(config, newMBKernel, updateKernelPath,
    4540     bootPrefix, newKernelInitrd))
    4541        return 1;
    4542        } else {
    4543        if (updateInitrd(config, updateKernelPath, bootPrefix,
    4544     newKernelInitrd))
    4545     return 1;
    4546        }
    4547      }      }
    4548      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
    4549                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
    Legend:
    Removed from v.2257  
    changed lines
      Added in v.2682