Magellan Linux

Diff of /trunk/grubby/grubby.c

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

revision 1859 by niro, Mon Jul 2 13:15:20 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 4069  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 || extrc == 1 || yrc == 1 ||   if (lrc == 1 || grc == 1 || gr2c == 1 || extrc == 1 || yrc == 1 ||

Legend:
Removed from v.1859  
changed lines
  Added in v.1868