Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/grubby/grubby.c

    Diff of /trunk/grubby/grubby.c

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

    revision 1801 by niro, Mon Apr 16 17:48:10 2012 UTC revision 1837 by niro, Mon Jul 2 12:46:11 2012 UTC
    # Line 1103  static struct grubConfig * readConfig(co Line 1103  static struct grubConfig * readConfig(co
    1103      /* get extras */      /* get extras */
    1104      int count = 0;      int count = 0;
    1105      for (i = 0; i < line->numElements; i++) {      for (i = 0; i < line->numElements; i++) {
    1106   if (count == 2) {   if (count >= 2) {
    1107      strcat(extras, line->elements[i].item);      strcat(extras, line->elements[i].item);
    1108      strcat(extras, line->elements[i].indent);      strcat(extras, line->elements[i].indent);
    1109   }   }
    # Line 3587  int main(int argc, const char ** argv) { Line 3587  int main(int argc, const char ** argv) {
    3587      }      }
    3588    
    3589      if (!cfi) {      if (!cfi) {
    3590            if (grub2FindConfig(&grub2ConfigType))
    3591        cfi = &grub2ConfigType;
    3592     else
    3593        #ifdef __ia64__        #ifdef __ia64__
    3594   cfi = &eliloConfigType;      cfi = &eliloConfigType;
    3595        #elif __powerpc__        #elif __powerpc__
    3596   cfi = &yabootConfigType;      cfi = &yabootConfigType;
    3597        #elif __sparc__        #elif __sparc__
    3598          cfi = &siloConfigType;              cfi = &siloConfigType;
    3599        #elif __s390__        #elif __s390__
    3600          cfi = &ziplConfigType;              cfi = &ziplConfigType;
    3601        #elif __s390x__        #elif __s390x__
    3602          cfi = &ziplConfigtype;              cfi = &ziplConfigtype;
    3603        #else        #else
             if (grub2FindConfig(&grub2ConfigType))  
         cfi = &grub2ConfigType;  
      else  
    3604      cfi = &grubConfigType;      cfi = &grubConfigType;
    3605        #endif        #endif
    3606      }      }
    Legend:
    Removed from v.1801  
    changed lines
      Added in v.1837