Magellan Linux

Diff of /trunk/grubby/grubby.c

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

revision 3136 by niro, Tue Jul 7 11:09:37 2020 UTC revision 3137 by niro, Tue Jul 7 11:10:21 2020 UTC
# Line 5154  int main(int argc, const char **argv) Line 5154  int main(int argc, const char **argv)
5154   if (!cfi) {   if (!cfi) {
5155   if (grub2FindConfig(&grub2ConfigType)) {   if (grub2FindConfig(&grub2ConfigType)) {
5156   cfi = &grub2ConfigType;   cfi = &grub2ConfigType;
5157     configureGrub2 = 1;
5158   if (envPath)   if (envPath)
5159   cfi->envFile = envPath;   cfi->envFile = envPath;
5160   } else   } else {
5161  #ifdef __ia64__  #ifdef __ia64__
5162   cfi = &eliloConfigType;   cfi = &eliloConfigType;
5163  #elif __powerpc__   configureLilo = 1;
5164    #elif defined(__powerpc__)
5165   cfi = &yabootConfigType;   cfi = &yabootConfigType;
5166  #elif __sparc__   configureYaboot = 1;
5167    #elif defined(__sparc__)
5168   cfi = &siloConfigType;   cfi = &siloConfigType;
5169  #elif __s390__   configureSilo = 1;
5170    #elif defined(__s390__) || defined(__s390x__)
5171   cfi = &ziplConfigType;   cfi = &ziplConfigType;
5172  #elif __s390x__   configureZipl = 1;
  cfi = &ziplConfigtype;  
5173  #else  #else
5174   cfi = &grubConfigType;   cfi = &grubConfigType;
5175     configureGrub = 1;
5176  #endif  #endif
5177     }
5178   }   }
5179    
5180   if (!grubConfig) {   if (!grubConfig) {

Legend:
Removed from v.3136  
changed lines
  Added in v.3137