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 2254 by niro, Mon Oct 21 13:59:08 2013 UTC revision 2255 by niro, Mon Oct 21 14:00:38 2013 UTC
    # Line 4360  int main(int argc, const char ** argv) { Line 4360  int main(int argc, const char ** argv) {
    4360          char * rootspec;          char * rootspec;
    4361    
    4362   if (config->defaultImage == -1) return 0;   if (config->defaultImage == -1) return 0;
    4363     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
    4364     cfi->defaultIsSaved)
    4365        config->defaultImage = 0;
    4366   entry = findEntryByIndex(config, config->defaultImage);   entry = findEntryByIndex(config, config->defaultImage);
    4367   if (!entry) return 0;   if (!entry) return 0;
    4368   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
    # Line 4378  int main(int argc, const char ** argv) { Line 4381  int main(int argc, const char ** argv) {
    4381   struct singleEntry * entry;   struct singleEntry * entry;
    4382    
    4383   if (config->defaultImage == -1) return 0;   if (config->defaultImage == -1) return 0;
    4384     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
    4385     cfi->defaultIsSaved)
    4386        config->defaultImage = 0;
    4387   entry = findEntryByIndex(config, config->defaultImage);   entry = findEntryByIndex(config, config->defaultImage);
    4388   if (!entry) return 0;   if (!entry) return 0;
    4389    
    # Line 4400  int main(int argc, const char ** argv) { Line 4406  int main(int argc, const char ** argv) {
    4406    
    4407      } else if (displayDefaultIndex) {      } else if (displayDefaultIndex) {
    4408          if (config->defaultImage == -1) return 0;          if (config->defaultImage == -1) return 0;
    4409     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
    4410     cfi->defaultIsSaved)
    4411        config->defaultImage = 0;
    4412          printf("%i\n", config->defaultImage);          printf("%i\n", config->defaultImage);
    4413          return 0;          return 0;
    4414    
    Legend:
    Removed from v.2254  
    changed lines
      Added in v.2255