Magellan Linux

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

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

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

    revision 1841 by niro, Mon Jul 2 12:49:27 2012 UTC revision 1845 by niro, Mon Jul 2 12:59:39 2012 UTC
    # Line 1323  static int writeConfig(struct grubConfig Line 1323  static int writeConfig(struct grubConfig
    1323    
    1324      /* most likely the symlink is relative, so change our      /* most likely the symlink is relative, so change our
    1325         directory to the dir of the symlink */         directory to the dir of the symlink */
    1326              rc = chdir(dirname(strdupa(outName)));              rc = chdir(dirname(outName));
    1327      do {      do {
    1328   buf = alloca(len + 1);   buf = alloca(len + 1);
    1329   rc = readlink(basename(outName), buf, len);   rc = readlink(basename(outName), buf, len);
    # Line 2979  static char * getRootSpecifier(char * st Line 2979  static char * getRootSpecifier(char * st
    2979  static char * getInitrdVal(struct grubConfig * config,  static char * getInitrdVal(struct grubConfig * config,
    2980     const char * prefix, struct singleLine *tmplLine,     const char * prefix, struct singleLine *tmplLine,
    2981     const char * newKernelInitrd,     const char * newKernelInitrd,
    2982     char ** extraInitrds, int extraInitrdCount)     const char ** extraInitrds, int extraInitrdCount)
    2983  {  {
    2984      char *initrdVal, *end;      char *initrdVal, *end;
    2985      int i;      int i;
    # Line 3024  static char * getInitrdVal(struct grubCo Line 3024  static char * getInitrdVal(struct grubCo
    3024    
    3025  int addNewKernel(struct grubConfig * config, struct singleEntry * template,  int addNewKernel(struct grubConfig * config, struct singleEntry * template,
    3026           const char * prefix,           const char * prefix,
    3027   char * newKernelPath, char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
    3028   char * newKernelArgs, char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
    3029   char ** extraInitrds, int extraInitrdCount,   const char ** extraInitrds, int extraInitrdCount,
    3030                   char * newMBKernel, char * newMBKernelArgs) {                   const char * newMBKernel, const char * newMBKernelArgs) {
    3031      struct singleEntry * new;      struct singleEntry * new;
    3032      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
    3033      int needs;      int needs;
    # Line 3813  int main(int argc, const char ** argv) { Line 3813  int main(int argc, const char ** argv) {
    3813      }      }
    3814      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
    3815                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
    3816                       extraInitrds, extraInitrdCount,                       (const char **)extraInitrds, extraInitrdCount,
    3817                       newMBKernel, newMBKernelArgs)) return 1;                       newMBKernel, newMBKernelArgs)) return 1;
    3818            
    3819    
    Legend:
    Removed from v.1841  
    changed lines
      Added in v.1845