Magellan Linux

  • Back to homepage
    • /[magellan-source]/tags/grubby-8_36/grubby.c

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

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

    revision 2687 by niro, Wed Jul 16 10:41:38 2014 UTC revision 2688 by niro, Wed Jul 16 10:42:34 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__)
    64    #define isEfiOnly 1
    65    #else
    66    #define isEfiOnly 0
    67    #endif
    68    
    69  char *saved_command_line = NULL;  char *saved_command_line = NULL;
    70    
    71  /* comments get lumped in with indention */  /* comments get lumped in with indention */
    # Line 720  static enum lineType_e preferredLineType Line 726  static enum lineType_e preferredLineType
    726   struct configFileInfo *cfi) {   struct configFileInfo *cfi) {
    727      if (isEfi && cfi == &grub2ConfigType) {      if (isEfi && cfi == &grub2ConfigType) {
    728   switch (type) {   switch (type) {
     #if defined(__aarch64__)  
    729   case LT_KERNEL:   case LT_KERNEL:
    730      return LT_KERNEL;      return isEfiOnly ? LT_KERNEL : LT_KERNEL_EFI;
    731   case LT_INITRD:   case LT_INITRD:
    732      return LT_INITRD;      return isEfiOnly ? LT_INITRD : LT_INITRD_EFI;
     #else  
      case LT_KERNEL:  
         return LT_KERNEL_EFI;  
      case LT_INITRD:  
         return LT_INITRD_EFI;  
     #endif  
    733   default:   default:
    734      return type;      return type;
    735   }   }
    Legend:
    Removed from v.2687  
    changed lines
      Added in v.2688