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 2692 by niro, Wed Jul 16 10:45:12 2014 UTC revision 2708 by niro, Wed Jul 16 10:56:09 2014 UTC
    # Line 60  int debug = 0; /* Currently just for tem Line 60  int debug = 0; /* Currently just for tem
    60    
    61  int isEfi = 0;  int isEfi = 0;
    62    
    63  #if defined(__arch64__)  #if defined(__aarch64__)
    64  #define isEfiOnly 1  #define isEfiOnly 1
    65  #else  #else
    66  #define isEfiOnly 0  #define isEfiOnly 0
    # Line 1199  static struct grubConfig * readConfig(co Line 1199  static struct grubConfig * readConfig(co
    1199       * lines came earlier in the template, make sure to use LT_HYPER       * lines came earlier in the template, make sure to use LT_HYPER
    1200       * instead of LT_KERNEL now       * instead of LT_KERNEL now
    1201       */       */
    1202      if (entry->multiboot)      if (entry && entry->multiboot)
    1203   line->type = LT_HYPER;   line->type = LT_HYPER;
    1204    
    1205          } else if (line->type == LT_MBMODULE) {          } else if (line->type == LT_MBMODULE) {
    # Line 2276  void displayEntry(struct singleEntry * e Line 2276  void displayEntry(struct singleEntry * e
    2276      struct singleLine * line;      struct singleLine * line;
    2277      char * root = NULL;      char * root = NULL;
    2278      int i;      int i;
    2279        int j;
    2280    
    2281      printf("index=%d\n", index);      printf("index=%d\n", index);
    2282    
    # Line 2367  void displayEntry(struct singleEntry * e Line 2368  void displayEntry(struct singleEntry * e
    2368   if (title)   if (title)
    2369      printf("title=%s\n", title);      printf("title=%s\n", title);
    2370      }      }
    2371    
    2372        for (j = 0, line = entry->lines; line; line = line->next) {
    2373     if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
    2374        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    2375     printf("mbmodule%d=", j);
    2376        else
    2377     printf("mbmodule%d=%s", j, prefix);
    2378    
    2379        for (i = 1; i < line->numElements; i++)
    2380     printf("%s%s", line->elements[i].item, line->elements[i].indent);
    2381        printf("\n");
    2382        j++;
    2383     }
    2384        }
    2385  }  }
    2386    
    2387  int isSuseSystem(void) {  int isSuseSystem(void) {
    Legend:
    Removed from v.2692  
    changed lines
      Added in v.2708