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 3003 by niro, Tue Jun 27 14:14:00 2017 UTC revision 3031 by niro, Tue Jun 27 14:48:09 2017 UTC
    # Line 132  struct singleEntry { Line 132  struct singleEntry {
    132  #define NEED_DEVTREE (1 << 6)  #define NEED_DEVTREE (1 << 6)
    133    
    134  #define MAIN_DEFAULT    (1 << 0)  #define MAIN_DEFAULT    (1 << 0)
    135    #define FIRST_ENTRY_INDEX    0 /* boot entry index value begin and increment
    136       from this initial value */
    137    #define NO_DEFAULT_ENTRY    -1 /* indicates that no specific default boot
    138       entry was set or currently exists */
    139  #define DEFAULT_SAVED       -2  #define DEFAULT_SAVED       -2
    140  #define DEFAULT_SAVED_GRUB2 -3  #define DEFAULT_SAVED_GRUB2 -3
    141    
    # Line 677  struct grubConfig { Line 681  struct grubConfig {
    681   int fallbackImage; /* just like defaultImage */   int fallbackImage; /* just like defaultImage */
    682   int flags;   int flags;
    683   struct configFileInfo *cfi;   struct configFileInfo *cfi;
    684     int isModified; /* assumes only one entry added
    685       per invocation of grubby */
    686  };  };
    687    
    688  blkid_cache blkid;  blkid_cache blkid;
    # Line 1296  static struct grubConfig *readConfig(con Line 1302  static struct grubConfig *readConfig(con
    1302   cfg->theLines = NULL;   cfg->theLines = NULL;
    1303   cfg->entries = NULL;   cfg->entries = NULL;
    1304   cfg->fallbackImage = 0;   cfg->fallbackImage = 0;
    1305     cfg->isModified = 0;
    1306    
    1307   /* copy everything we have */   /* copy everything we have */
    1308   while (*head) {   while (*head) {
    # Line 1615  static struct grubConfig *readConfig(con Line 1622  static struct grubConfig *readConfig(con
    1622   *end == ' ' || *end == '\t'))   *end == ' ' || *end == '\t'))
    1623   end++;   end++;
    1624   if (*end)   if (*end)
    1625   cfg->defaultImage = -1;   cfg->defaultImage = NO_DEFAULT_ENTRY;
    1626   } else if (defaultLine->numElements == 3) {   } else if (defaultLine->numElements == 3) {
    1627   char *value = defaultLine->elements[2].item;   char *value = defaultLine->elements[2].item;
    1628   while (*value && (*value == '"' ||   while (*value && (*value == '"' ||
    # Line 1628  static struct grubConfig *readConfig(con Line 1635  static struct grubConfig *readConfig(con
    1635   *end == ' ' || *end == '\t'))   *end == ' ' || *end == '\t'))
    1636   end++;   end++;
    1637   if (*end)   if (*end)
    1638   cfg->defaultImage = -1;   cfg->defaultImage = NO_DEFAULT_ENTRY;
    1639   }   }
    1640   } else if (cfi->defaultSupportSaved &&   } else if (cfi->defaultSupportSaved &&
    1641     !strncmp(defaultLine->elements[1].item, "saved",     !strncmp(defaultLine->elements[1].item, "saved",
    # Line 1638  static struct grubConfig *readConfig(con Line 1645  static struct grubConfig *readConfig(con
    1645   cfg->defaultImage =   cfg->defaultImage =
    1646      strtol(defaultLine->elements[1].item, &end, 10);      strtol(defaultLine->elements[1].item, &end, 10);
    1647   if (*end)   if (*end)
    1648   cfg->defaultImage = -1;   cfg->defaultImage = NO_DEFAULT_ENTRY;
    1649   } else if (defaultLine->numElements >= 2) {   } else if (defaultLine->numElements >= 2) {
    1650   int i = 0;   int i = 0;
    1651   while ((entry = findEntryByIndex(cfg, i))) {   while ((entry = findEntryByIndex(cfg, i))) {
    # Line 1666  static struct grubConfig *readConfig(con Line 1673  static struct grubConfig *readConfig(con
    1673   if (entry) {   if (entry) {
    1674   cfg->defaultImage = i;   cfg->defaultImage = i;
    1675   } else {   } else {
    1676   cfg->defaultImage = -1;   cfg->defaultImage = NO_DEFAULT_ENTRY;
    1677   }   }
    1678   }   }
    1679   } else if (cfg->cfi->defaultIsSaved && cfg->cfi->getEnv) {   } else if (cfg->cfi->defaultIsSaved && cfg->cfi->getEnv) {
    # Line 1683  static struct grubConfig *readConfig(con Line 1690  static struct grubConfig *readConfig(con
    1690   cfg->defaultImage = index;   cfg->defaultImage = index;
    1691   }   }
    1692   } else {   } else {
    1693   cfg->defaultImage = 0;   cfg->defaultImage = FIRST_ENTRY_INDEX;
    1694   }   }
    1695    
    1696   return cfg;   return cfg;
    # Line 1703  static void writeDefault(FILE * out, cha Line 1710  static void writeDefault(FILE * out, cha
    1710   fprintf(out, "%sdefault%ssaved\n", indent, separator);   fprintf(out, "%sdefault%ssaved\n", indent, separator);
    1711   else if (cfg->cfi->defaultIsSaved) {   else if (cfg->cfi->defaultIsSaved) {
    1712   fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);   fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
    1713   if (cfg->defaultImage >= 0 && cfg->cfi->setEnv) {   if (cfg->defaultImage >= FIRST_ENTRY_INDEX && cfg->cfi->setEnv) {
    1714   char *title;   char *title;
    1715   entry = findEntryByIndex(cfg, cfg->defaultImage);   int trueIndex, currentIndex;
    1716    
    1717     trueIndex = 0;
    1718     currentIndex = 0;
    1719    
    1720     while ((entry = findEntryByIndex(cfg, currentIndex))) {
    1721     if (!entry->skip) {
    1722     if (trueIndex == cfg->defaultImage) {
    1723     break;
    1724     }
    1725     trueIndex++;
    1726     }
    1727     currentIndex++;
    1728     }
    1729   line = getLineByType(LT_MENUENTRY, entry->lines);   line = getLineByType(LT_MENUENTRY, entry->lines);
    1730   if (!line)   if (!line)
    1731   line = getLineByType(LT_TITLE, entry->lines);   line = getLineByType(LT_TITLE, entry->lines);
    # Line 1716  static void writeDefault(FILE * out, cha Line 1736  static void writeDefault(FILE * out, cha
    1736   "saved_entry", title);   "saved_entry", title);
    1737   }   }
    1738   }   }
    1739   } else if (cfg->defaultImage > -1) {   } else if (cfg->defaultImage >= FIRST_ENTRY_INDEX) {
    1740   if (cfg->cfi->defaultIsIndex) {   if (cfg->cfi->defaultIsIndex) {
    1741   if (cfg->cfi->defaultIsVariable) {   if (cfg->cfi->defaultIsVariable) {
    1742   fprintf(out, "%sset default=\"%d\"\n", indent,   fprintf(out, "%sset default=\"%d\"\n", indent,
    # Line 2420  struct singleEntry *findTemplate(struct Line 2440  struct singleEntry *findTemplate(struct
    2440   }   }
    2441   }   }
    2442   }   }
    2443   } else if (cfg->defaultImage > -1) {   } else if (cfg->defaultImage >= FIRST_ENTRY_INDEX) {
    2444   entry = findEntryByIndex(cfg, cfg->defaultImage);   entry = findEntryByIndex(cfg, cfg->defaultImage);
    2445   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
    2446   if (indexPtr)   if (indexPtr)
    # Line 2432  struct singleEntry *findTemplate(struct Line 2452  struct singleEntry *findTemplate(struct
    2452   index = 0;   index = 0;
    2453   while ((entry = findEntryByIndex(cfg, index))) {   while ((entry = findEntryByIndex(cfg, index))) {
    2454   if (suitableImage(entry, prefix, skipRemoved, flags)) {   if (suitableImage(entry, prefix, skipRemoved, flags)) {
    2455   int j;   int j, unmodifiedIndex;
    2456   for (j = 0; j < index; j++) {  
    2457     unmodifiedIndex = index;
    2458    
    2459     for (j = 0; j < unmodifiedIndex; j++) {
    2460   entry2 = findEntryByIndex(cfg, j);   entry2 = findEntryByIndex(cfg, j);
    2461   if (entry2->skip)   if (entry2->skip)
    2462   index--;   index--;
    # Line 2494  void markRemovedImage(struct grubConfig Line 2517  void markRemovedImage(struct grubConfig
    2517   entry->skip = 1;   entry->skip = 1;
    2518  }  }
    2519    
    2520  void setDefaultImage(struct grubConfig *config, int hasNew,  void setDefaultImage(struct grubConfig *config, int isAddingBootEntry,
    2521       const char *defaultKernelPath, int newIsDefault,       const char *defaultKernelPath, int newBootEntryIsDefault,
    2522       const char *prefix, int flags, int index)       const char *prefix, int flags,
    2523  {       int newDefaultBootEntryIndex, int newBootEntryIndex)
    2524   struct singleEntry *entry, *entry2, *newDefault;  {
    2525   int i, j;   struct singleEntry *bootEntry, *newDefault;
    2526     int indexToVerify, firstKernelEntryIndex, currentLookupIndex;
    2527   if (newIsDefault) {  
    2528   config->defaultImage = 0;          /* initialize */
    2529   return;          currentLookupIndex = FIRST_ENTRY_INDEX;
    2530   } else if ((index >= 0) && config->cfi->defaultIsIndex) {  
    2531   if (findEntryByIndex(config, index))   /* handle the two cases where the user explictly picks the default
    2532   config->defaultImage = index;   * boot entry index as it would exist post-modification */
    2533   else  
    2534   config->defaultImage = -1;   /* Case 1: user chose to make the latest boot entry the default */
    2535     if (newBootEntryIsDefault) {
    2536     config->defaultImage = newBootEntryIndex;
    2537   return;   return;
    2538   } else if (defaultKernelPath) {   }
    2539   i = 0;  
    2540   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {   /* Case 2: user picked an arbitrary index as the default boot entry */
    2541   config->defaultImage = i;   if (newDefaultBootEntryIndex >= FIRST_ENTRY_INDEX) {
    2542   } else {   indexToVerify = newDefaultBootEntryIndex;
    2543   config->defaultImage = -1;  
    2544     /* user chose to make latest boot entry the default */
    2545     if (newDefaultBootEntryIndex == newBootEntryIndex) {
    2546     config->defaultImage = newBootEntryIndex;
    2547   return;   return;
    2548   }   }
      }  
    2549    
    2550   /* defaultImage now points to what we'd like to use, but before any   /* the user picks the default index based on the
    2551   * order changes */   * order of the bootloader configuration after
    2552   if ((config->defaultImage == DEFAULT_SAVED) ||   * modification; ensure we are checking for the
    2553      (config->defaultImage == DEFAULT_SAVED_GRUB2))   * existence of the correct entry */
    2554   /* default is set to saved, we don't want to change it */   if (newBootEntryIndex < newDefaultBootEntryIndex) {
    2555     if (!config->isModified)
    2556     indexToVerify--;
    2557     }
    2558    
    2559     /* verify the user selected index will exist */
    2560     if (findEntryByIndex(config, indexToVerify)) {
    2561     config->defaultImage = newDefaultBootEntryIndex;
    2562     } else {
    2563     config->defaultImage = NO_DEFAULT_ENTRY;
    2564     }
    2565    
    2566   return;   return;
    2567     }
    2568    
    2569   if (config->defaultImage > -1)   /* handle cases where the index value may shift */
      entry = findEntryByIndex(config, config->defaultImage);  
      else  
      entry = NULL;  
    2570    
    2571   if (entry && !entry->skip) {   /* check validity of existing default or first-entry-found
    2572   /* we can preserve the default */     selection */
    2573   if (hasNew)   if (defaultKernelPath) {
    2574   config->defaultImage++;                  /* we must initialize this */
    2575                    firstKernelEntryIndex = 0;
    2576     /* user requested first-entry-found */
    2577     if (!findEntryByPath(config, defaultKernelPath,
    2578         prefix, &firstKernelEntryIndex)) {
    2579     /* don't change default if can't find match */
    2580     config->defaultImage = NO_DEFAULT_ENTRY;
    2581     return;
    2582     }
    2583    
    2584   /* count the number of entries erased before this one */   config->defaultImage = firstKernelEntryIndex;
    2585   for (j = 0; j < config->defaultImage; j++) {  
    2586   entry2 = findEntryByIndex(config, j);   /* this is where we start looking for decrement later */
    2587   if (entry2->skip)   currentLookupIndex = config->defaultImage;
    2588   config->defaultImage--;  
    2589     if (isAddingBootEntry && !config->isModified &&
    2590        (newBootEntryIndex < config->defaultImage)) {
    2591     /* increment because new entry added before default */
    2592     config->defaultImage++;
    2593   }   }
      } else if (hasNew) {  
      config->defaultImage = 0;  
    2594   } else {   } else {
    2595   /* Either we just erased the default (or the default line was                  /* check to see if the default is stored in the environment */
    2596   * bad to begin with) and didn't put a new one in. We'll use                  if (config->defaultImage < FIRST_ENTRY_INDEX) {
    2597   * the first valid image. */                      if (config->defaultImage == DEFAULT_SAVED || config->defaultImage == DEFAULT_SAVED_GRUB2)
    2598                        {
    2599                            if (config->cfi->defaultIsSaved) {
    2600                                if (config->cfi->getEnv) {
    2601                                    char *defaultTitle = config->cfi->getEnv(config->cfi, "saved_entry");
    2602    
    2603                                    if (defaultTitle) {
    2604                                        if (isnumber(defaultTitle)) {
    2605                                            currentLookupIndex = atoi(defaultTitle);
    2606                                        } else {
    2607                                            findEntryByTitle(config, defaultTitle, &currentLookupIndex);
    2608                                        }
    2609                                        /* set the default Image to an actual index */
    2610                                        config->defaultImage = currentLookupIndex;
    2611                                    }
    2612                                }
    2613                             }
    2614                        }
    2615                    } else {
    2616                            /* use pre-existing default entry from the file*/
    2617                            currentLookupIndex = config->defaultImage;
    2618                    }
    2619    
    2620     if (isAddingBootEntry
    2621        && (newBootEntryIndex <= config->defaultImage)) {
    2622     config->defaultImage++;
    2623    
    2624     if (config->isModified) {
    2625     currentLookupIndex++;
    2626     }
    2627     }
    2628     }
    2629    
    2630     /* sanity check - is this entry index valid? */
    2631     bootEntry = findEntryByIndex(config, currentLookupIndex);
    2632    
    2633     if ((bootEntry && bootEntry->skip) || !bootEntry) {
    2634     /* entry is to be skipped or is invalid */
    2635     if (isAddingBootEntry) {
    2636     config->defaultImage = newBootEntryIndex;
    2637     return;
    2638     }
    2639   newDefault =   newDefault =
    2640      findTemplate(config, prefix, &config->defaultImage, 1,      findTemplate(config, prefix, &config->defaultImage, 1,
    2641   flags);   flags);
    2642   if (!newDefault)   if (!newDefault) {
    2643   config->defaultImage = -1;   config->defaultImage = NO_DEFAULT_ENTRY;
    2644     }
    2645    
    2646     return;
    2647     }
    2648    
    2649     currentLookupIndex--;
    2650    
    2651     /* decrement index by the total number of entries deleted */
    2652    
    2653     for (indexToVerify = currentLookupIndex;
    2654         indexToVerify >= FIRST_ENTRY_INDEX; indexToVerify--) {
    2655    
    2656     bootEntry = findEntryByIndex(config, indexToVerify);
    2657    
    2658     if (bootEntry && bootEntry->skip) {
    2659     config->defaultImage--;
    2660     }
    2661   }   }
    2662  }  }
    2663    
    # Line 2582  void setFallbackImage(struct grubConfig Line 2686  void setFallbackImage(struct grubConfig
    2686   }   }
    2687  }  }
    2688    
    2689  void displayEntry(struct singleEntry *entry, const char *prefix, int index)  void displayEntry(struct grubConfig *config, struct singleEntry *entry, const char *prefix, int index)
    2690  {  {
    2691   struct singleLine *line;   struct singleLine *line;
    2692   char *root = NULL;   char *root = NULL;
    # Line 2678  void displayEntry(struct singleEntry *en Line 2782  void displayEntry(struct singleEntry *en
    2782    
    2783   line = getLineByType(LT_TITLE, entry->lines);   line = getLineByType(LT_TITLE, entry->lines);
    2784   if (line) {   if (line) {
    2785   printf("title=%s\n", line->elements[1].item);                  char *entryTitle;
    2786                    /* if we can extractTitle, then it's a zipl config and
    2787                     * if not then we go ahead with what's existed prior */
    2788                    entryTitle = extractTitle(config, line);
    2789                    if (!entryTitle) {
    2790                        entryTitle=line->elements[1].item;
    2791                    }
    2792     printf("title=%s\n", entryTitle);
    2793   } else {   } else {
    2794   char *title;   char *title;
    2795   line = getLineByType(LT_MENUENTRY, entry->lines);   line = getLineByType(LT_MENUENTRY, entry->lines);
    # Line 3094  int displayInfo(struct grubConfig *confi Line 3205  int displayInfo(struct grubConfig *confi
    3205   printf("lba\n");   printf("lba\n");
    3206   }   }
    3207    
    3208   displayEntry(entry, prefix, i);   displayEntry(config, entry, prefix, i);
    3209    
    3210   i++;   i++;
    3211   while ((entry = findEntryByPath(config, kernel, prefix, &i))) {   while ((entry = findEntryByPath(config, kernel, prefix, &i))) {
    3212   displayEntry(entry, prefix, i);   displayEntry(config, entry, prefix, i);
    3213   i++;   i++;
    3214   }   }
    3215    
    # Line 4210  int addNewKernel(struct grubConfig *conf Line 4321  int addNewKernel(struct grubConfig *conf
    4321   const char *newKernelArgs, const char *newKernelInitrd,   const char *newKernelArgs, const char *newKernelInitrd,
    4322   const char **extraInitrds, int extraInitrdCount,   const char **extraInitrds, int extraInitrdCount,
    4323   const char *newMBKernel, const char *newMBKernelArgs,   const char *newMBKernel, const char *newMBKernelArgs,
    4324   const char *newDevTreePath)   const char *newDevTreePath, int newIndex)
    4325  {  {
    4326   struct singleEntry *new;   struct singleEntry *new, *entry, *prev = NULL;
    4327   struct singleLine *newLine = NULL, *tmplLine = NULL, *masterLine = NULL;   struct singleLine *newLine = NULL, *tmplLine = NULL, *masterLine = NULL;
    4328   int needs;   int needs;
    4329     char *indexs;
    4330   char *chptr;   char *chptr;
    4331     int rc;
    4332    
    4333   if (!newKernelPath)   if (!newKernelPath)
    4334   return 0;   return 0;
    4335    
    4336     rc = asprintf(&indexs, "%d", newIndex);
    4337     if (rc < 0)
    4338     return 1;
    4339    
    4340   /* if the newKernelTitle is too long silently munge it into something   /* if the newKernelTitle is too long silently munge it into something
    4341   * we can live with. truncating is first check, then we'll just mess with   * we can live with. truncating is first check, then we'll just mess with
    4342   * it until it looks better */   * it until it looks better */
    # Line 4242  int addNewKernel(struct grubConfig *conf Line 4359  int addNewKernel(struct grubConfig *conf
    4359   new = malloc(sizeof(*new));   new = malloc(sizeof(*new));
    4360   new->skip = 0;   new->skip = 0;
    4361   new->multiboot = 0;   new->multiboot = 0;
      new->next = config->entries;  
    4362   new->lines = NULL;   new->lines = NULL;
    4363   config->entries = new;   entry = config->entries;
    4364     for (unsigned int i = 0; i < newIndex; i++) {
    4365     if (!entry)
    4366     break;
    4367     prev = entry;
    4368     entry = entry->next;
    4369     }
    4370     new->next = entry;
    4371    
    4372     if (prev)
    4373     prev->next = new;
    4374     else
    4375     config->entries = new;
    4376    
    4377   /* copy/update from the template */   /* copy/update from the template */
    4378   needs = NEED_KERNEL | NEED_TITLE;   needs = NEED_KERNEL | NEED_TITLE;
    # Line 4707  int addNewKernel(struct grubConfig *conf Line 4835  int addNewKernel(struct grubConfig *conf
    4835   abort();   abort();
    4836   }   }
    4837    
    4838   if (updateImage(config, "0", prefix, newKernelArgs, NULL,   if (updateImage(config, indexs, prefix, newKernelArgs, NULL,
    4839   newMBKernelArgs, NULL))   newMBKernelArgs, NULL)) {
    4840     config->isModified = 1;
    4841   return 1;   return 1;
    4842     }
    4843    
    4844   return 0;   return 0;
    4845  }  }
    # Line 4737  int main(int argc, const char **argv) Line 4867  int main(int argc, const char **argv)
    4867   char *newDevTreePath = NULL;   char *newDevTreePath = NULL;
    4868   char *newMBKernel = NULL;   char *newMBKernel = NULL;
    4869   char *newMBKernelArgs = NULL;   char *newMBKernelArgs = NULL;
    4870     int newIndex = 0;
    4871   char *removeMBKernelArgs = NULL;   char *removeMBKernelArgs = NULL;
    4872   char *removeMBKernel = NULL;   char *removeMBKernel = NULL;
    4873   char *bootPrefix = NULL;   char *bootPrefix = NULL;
    # Line 4771  int main(int argc, const char **argv) Line 4902  int main(int argc, const char **argv)
    4902   NULL},   NULL},
    4903   {"boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,   {"boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
    4904   _   _
    4905   ("filestystem which contains /boot directory (for testing only)"),   ("filesystem which contains /boot directory (for testing only)"),
    4906   _("bootfs")},   _("bootfs")},
    4907  #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)  #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
    4908   {"bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,   {"bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
    # Line 4843  int main(int argc, const char **argv) Line 4974  int main(int argc, const char **argv)
    4974   {"set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,   {"set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,
    4975   _("make the given entry index the default entry"),   _("make the given entry index the default entry"),
    4976   _("entry-index")},   _("entry-index")},
    4977     {"set-index", 0, POPT_ARG_INT, &newIndex, 0,
    4978     _("use the given index when creating a new entry"),
    4979     _("entry-index")},
    4980   {"silo", 0, POPT_ARG_NONE, &configureSilo, 0,   {"silo", 0, POPT_ARG_NONE, &configureSilo, 0,
    4981   _("configure silo bootloader")},   _("configure silo bootloader")},
    4982   {"title", 0, POPT_ARG_STRING, &newKernelTitle, 0,   {"title", 0, POPT_ARG_STRING, &newKernelTitle, 0,
    # Line 5157  int main(int argc, const char **argv) Line 5291  int main(int argc, const char **argv)
    5291   struct singleEntry *entry;   struct singleEntry *entry;
    5292   char *rootspec;   char *rootspec;
    5293    
    5294   if (config->defaultImage == -1)   if (config->defaultImage == NO_DEFAULT_ENTRY)
    5295   return 0;   return 0;
    5296   if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&   if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
    5297      cfi->defaultIsSaved)      cfi->defaultIsSaved)
    5298   config->defaultImage = 0;   config->defaultImage = FIRST_ENTRY_INDEX;
    5299   entry = findEntryByIndex(config, config->defaultImage);   entry = findEntryByIndex(config, config->defaultImage);
    5300   if (!entry)   if (!entry)
    5301   return 0;   return 0;
    # Line 5184  int main(int argc, const char **argv) Line 5318  int main(int argc, const char **argv)
    5318   struct singleLine *line;   struct singleLine *line;
    5319   struct singleEntry *entry;   struct singleEntry *entry;
    5320    
    5321   if (config->defaultImage == -1)   if (config->defaultImage == NO_DEFAULT_ENTRY)
    5322   return 0;   return 0;
    5323   if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&   if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
    5324      cfi->defaultIsSaved)      cfi->defaultIsSaved)
    5325   config->defaultImage = 0;   config->defaultImage = FIRST_ENTRY_INDEX;
    5326   entry = findEntryByIndex(config, config->defaultImage);   entry = findEntryByIndex(config, config->defaultImage);
    5327   if (!entry)   if (!entry)
    5328   return 0;   return 0;
    # Line 5218  int main(int argc, const char **argv) Line 5352  int main(int argc, const char **argv)
    5352   return 0;   return 0;
    5353    
    5354   } else if (displayDefaultIndex) {   } else if (displayDefaultIndex) {
    5355   if (config->defaultImage == -1)   if (config->defaultImage == NO_DEFAULT_ENTRY)
    5356   return 0;   return 0;
    5357   if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&   if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
    5358      cfi->defaultIsSaved)      cfi->defaultIsSaved)
    5359   config->defaultImage = 0;   config->defaultImage = FIRST_ENTRY_INDEX;
    5360   printf("%i\n", config->defaultImage);   printf("%i\n", config->defaultImage);
    5361   return 0;   return 0;
    5362    
    # Line 5238  int main(int argc, const char **argv) Line 5372  int main(int argc, const char **argv)
    5372   markRemovedImage(config, removeKernelPath, bootPrefix);   markRemovedImage(config, removeKernelPath, bootPrefix);
    5373   markRemovedImage(config, removeMBKernel, bootPrefix);   markRemovedImage(config, removeMBKernel, bootPrefix);
    5374   setDefaultImage(config, newKernelPath != NULL, defaultKernel,   setDefaultImage(config, newKernelPath != NULL, defaultKernel,
    5375   makeDefault, bootPrefix, flags, defaultIndex);   makeDefault, bootPrefix, flags, defaultIndex,
    5376     newIndex);
    5377   setFallbackImage(config, newKernelPath != NULL);   setFallbackImage(config, newKernelPath != NULL);
    5378   if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,   if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
    5379   removeArgs, newMBKernelArgs, removeMBKernelArgs))   removeArgs, newMBKernelArgs, removeMBKernelArgs))
    # Line 5258  int main(int argc, const char **argv) Line 5393  int main(int argc, const char **argv)
    5393   if (addNewKernel(config, template, bootPrefix, newKernelPath,   if (addNewKernel(config, template, bootPrefix, newKernelPath,
    5394   newKernelTitle, newKernelArgs, newKernelInitrd,   newKernelTitle, newKernelArgs, newKernelInitrd,
    5395   (const char **)extraInitrds, extraInitrdCount,   (const char **)extraInitrds, extraInitrdCount,
    5396   newMBKernel, newMBKernelArgs, newDevTreePath))   newMBKernel, newMBKernelArgs, newDevTreePath,
    5397     newIndex))
    5398   return 1;   return 1;
    5399    
    5400   if (numEntries(config) == 0) {   if (numEntries(config) == 0) {
    Legend:
    Removed from v.3003  
    changed lines
      Added in v.3031