Magellan Linux

Diff of /trunk/mkinitrd-magellan/grubby/grubby.c

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

revision 925 by niro, Wed Oct 28 09:50:42 2009 UTC revision 926 by niro, Wed Oct 28 13:29:38 2009 UTC
# Line 1582  int parseSysconfigGrub(int * lbaPtr, cha Line 1582  int parseSysconfigGrub(int * lbaPtr, cha
1582      char * start;      char * start;
1583      char * param;      char * param;
1584    
1585      in = fopen("/etc/sysconfig/grub", "r");      in = fopen("/etc/conf.d/grub", "r");
1586      if (!in) return 1;      if (!in) return 1;
1587    
1588      if (lbaPtr) *lbaPtr = 0;      if (lbaPtr) *lbaPtr = 0;
# Line 1644  int displayInfo(struct grubConfig * conf Line 1644  int displayInfo(struct grubConfig * conf
1644   return 1;   return 1;
1645      }      }
1646    
1647      /* this is a horrible hack to support /etc/sysconfig/grub; there must      /* this is a horrible hack to support /etc/conf.d/grub; there must
1648         be a better way */         be a better way */
1649      if (config->cfi == &grubConfigType) {      if (config->cfi == &grubConfigType) {
1650   dumpSysconfigGrub();   dumpSysconfigGrub();

Legend:
Removed from v.925  
changed lines
  Added in v.926