Magellan Linux

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

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

revision 1866 by niro, Mon Jul 2 13:21:25 2012 UTC revision 1934 by niro, Mon Oct 1 12:08:46 2012 UTC
# 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(strdupa(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);

Legend:
Removed from v.1866  
changed lines
  Added in v.1934