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 2683 by niro, Wed Jul 16 09:51:14 2014 UTC revision 2977 by niro, Thu Jun 30 10:24:27 2016 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(__aarch64__)
    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 92  enum lineType_e { Line 98  enum lineType_e {
    98      LT_INITRD_EFI   = 1 << 21,      LT_INITRD_EFI   = 1 << 21,
    99      LT_KERNEL_16    = 1 << 22,      LT_KERNEL_16    = 1 << 22,
    100      LT_INITRD_16    = 1 << 23,      LT_INITRD_16    = 1 << 23,
    101      LT_UNKNOWN      = 1 << 24,      LT_DEVTREE      = 1 << 24,
    102        LT_UNKNOWN      = 1 << 25,
    103  };  };
    104    
    105  struct singleLine {  struct singleLine {
    # Line 121  struct singleEntry { Line 128  struct singleEntry {
    128  #define NEED_ARGS    (1 << 3)  #define NEED_ARGS    (1 << 3)
    129  #define NEED_MB      (1 << 4)  #define NEED_MB      (1 << 4)
    130  #define NEED_END     (1 << 5)  #define NEED_END     (1 << 5)
    131    #define NEED_DEVTREE (1 << 6)
    132    
    133  #define MAIN_DEFAULT    (1 << 0)  #define MAIN_DEFAULT    (1 << 0)
    134  #define DEFAULT_SAVED       -2  #define DEFAULT_SAVED       -2
    # Line 153  struct configFileInfo { Line 161  struct configFileInfo {
    161      int defaultIsVariable;      int defaultIsVariable;
    162      int defaultSupportSaved;      int defaultSupportSaved;
    163      int defaultIsSaved;      int defaultIsSaved;
    164        int defaultIsUnquoted;
    165      enum lineType_e entryStart;      enum lineType_e entryStart;
    166      enum lineType_e entryEnd;      enum lineType_e entryEnd;
    167      int needsBootPrefix;      int needsBootPrefix;
    # Line 231  struct keywordTypes grub2Keywords[] = { Line 240  struct keywordTypes grub2Keywords[] = {
    240      { "initrd16",   LT_INITRD_16,   ' ', ' ' },      { "initrd16",   LT_INITRD_16,   ' ', ' ' },
    241      { "module",     LT_MBMODULE,    ' ' },      { "module",     LT_MBMODULE,    ' ' },
    242      { "kernel",     LT_HYPER,       ' ' },      { "kernel",     LT_HYPER,       ' ' },
    243        { "devicetree", LT_DEVTREE,  ' ' },
    244      { NULL, 0, 0 },      { NULL, 0, 0 },
    245  };  };
    246    
    # Line 572  struct keywordTypes extlinuxKeywords[] = Line 582  struct keywordTypes extlinuxKeywords[] =
    582      { "initrd",    LT_INITRD,      ' ', ',' },      { "initrd",    LT_INITRD,      ' ', ',' },
    583      { "append",    LT_KERNELARGS,  ' ' },      { "append",    LT_KERNELARGS,  ' ' },
    584      { "prompt",     LT_UNKNOWN,     ' ' },      { "prompt",     LT_UNKNOWN,     ' ' },
    585        { "fdt",        LT_DEVTREE,     ' ' },
    586        { "fdtdir",     LT_DEVTREE,     ' ' },
    587      { NULL,    0, 0 },      { NULL,    0, 0 },
    588  };  };
    589  int useextlinuxmenu;  int useextlinuxmenu;
    # Line 627  struct configFileInfo extlinuxConfigType Line 639  struct configFileInfo extlinuxConfigType
    639      .needsBootPrefix = 1,      .needsBootPrefix = 1,
    640      .maxTitleLength = 255,      .maxTitleLength = 255,
    641      .mbAllowExtraInitRds = 1,      .mbAllowExtraInitRds = 1,
    642        .defaultIsUnquoted = 1,
    643  };  };
    644    
    645  struct grubConfig {  struct grubConfig {
    # Line 718  static enum lineType_e preferredLineType Line 731  static enum lineType_e preferredLineType
    731      if (isEfi && cfi == &grub2ConfigType) {      if (isEfi && cfi == &grub2ConfigType) {
    732   switch (type) {   switch (type) {
    733   case LT_KERNEL:   case LT_KERNEL:
    734      return LT_KERNEL_EFI;      return isEfiOnly ? LT_KERNEL : LT_KERNEL_EFI;
    735   case LT_INITRD:   case LT_INITRD:
    736      return LT_INITRD_EFI;      return isEfiOnly ? LT_INITRD : LT_INITRD_EFI;
    737   default:   default:
    738      return type;      return type;
    739   }   }
    # Line 816  static int isEntryStart(struct singleLin Line 829  static int isEntryStart(struct singleLin
    829    
    830  /* extract the title from within brackets (for zipl) */  /* extract the title from within brackets (for zipl) */
    831  static char * extractTitle(struct singleLine * line) {  static char * extractTitle(struct singleLine * line) {
    832      /* bracketed title... let's extract it (leaks a byte) */      /* bracketed title... let's extract it */
    833      char * title = NULL;      char * title = NULL;
    834      if (line->type == LT_TITLE) {      if (line->type == LT_TITLE) {
    835   title = strdup(line->elements[0].item);   title = strdup(line->elements[0].item + 1);
      title++;  
    836   *(title + strlen(title) - 1) = '\0';   *(title + strlen(title) - 1) = '\0';
    837      } else if (line->type == LT_MENUENTRY)      } else if (line->type == LT_MENUENTRY)
    838   title = strdup(line->elements[1].item);   title = strdup(line->elements[1].item);
    # Line 1182  static struct grubConfig * readConfig(co Line 1194  static struct grubConfig * readConfig(co
    1194   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
    1195   defaultLine = line;   defaultLine = line;
    1196      }      }
      } else if (line->type == LT_DEFAULT && line->numElements == 2) {  
         cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;  
         defaultLine = line;  
    1197    
    1198          } else if (iskernel(line->type)) {          } else if (iskernel(line->type)) {
    1199      /* if by some freak chance this is multiboot and the "module"      /* if by some freak chance this is multiboot and the "module"
    1200       * lines came earlier in the template, make sure to use LT_HYPER       * lines came earlier in the template, make sure to use LT_HYPER
    1201       * instead of LT_KERNEL now       * instead of LT_KERNEL now
    1202       */       */
    1203      if (entry->multiboot)      if (entry && entry->multiboot)
    1204   line->type = LT_HYPER;   line->type = LT_HYPER;
    1205    
    1206          } else if (line->type == LT_MBMODULE) {          } else if (line->type == LT_MBMODULE) {
    # Line 1217  static struct grubConfig * readConfig(co Line 1226  static struct grubConfig * readConfig(co
    1226      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);
    1227      if (*end) cfg->fallbackImage = -1;      if (*end) cfg->fallbackImage = -1;
    1228    
    1229   } else if (line->type == LT_TITLE && line->numElements > 1) {   } else if ((line->type == LT_DEFAULT && cfi->defaultIsUnquoted) ||
    1230      /* make the title a single argument (undoing our parsing) */                  (line->type == LT_TITLE && line->numElements > 1)) {
    1231        /* make the title/default a single argument (undoing our parsing) */
    1232      len = 0;      len = 0;
    1233      for (int i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    1234   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
    # Line 1325  static struct grubConfig * readConfig(co Line 1335  static struct grubConfig * readConfig(co
    1335      }      }
    1336   }   }
    1337    
    1338     if (line->type == LT_DEFAULT && line->numElements == 2) {
    1339        cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
    1340        defaultLine = line;
    1341     }
    1342    
    1343   /* If we find a generic config option which should live at the   /* If we find a generic config option which should live at the
    1344     top of the file, move it there. Old versions of grubby were     top of the file, move it there. Old versions of grubby were
    1345     probably responsible for putting new images in the wrong     probably responsible for putting new images in the wrong
    # Line 1946  struct singleEntry * findEntryByPath(str Line 1961  struct singleEntry * findEntryByPath(str
    1961   }   }
    1962    
    1963   indexVars[i + 1] = -1;   indexVars[i + 1] = -1;
    1964    
    1965   i = 0;   i = 0;
    1966   if (index) {   if (index) {
    1967      while (i < *index) i++;      while (i < *index) {
    1968      if (indexVars[i] == -1) return NULL;   i++;
    1969     if (indexVars[i] == -1) return NULL;
    1970        }
    1971   }   }
    1972    
    1973   entry = findEntryByIndex(config, indexVars[i]);   entry = findEntryByIndex(config, indexVars[i]);
    # Line 2104  struct singleEntry * findTemplate(struct Line 2121  struct singleEntry * findTemplate(struct
    2121   } else {   } else {
    2122      entry = findEntryByTitle(cfg, defTitle, &index);      entry = findEntryByTitle(cfg, defTitle, &index);
    2123   }   }
    2124   if (entry)   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
    2125      cfg->defaultImage = index;      cfg->defaultImage = index;
    2126        if (indexPtr)
    2127     *indexPtr = index;
    2128        return entry;
    2129     }
    2130      }      }
    2131   }   }
    2132      } else if (cfg->defaultImage > -1) {      } else if (cfg->defaultImage > -1) {
    # Line 2262  void displayEntry(struct singleEntry * e Line 2283  void displayEntry(struct singleEntry * e
    2283      struct singleLine * line;      struct singleLine * line;
    2284      char * root = NULL;      char * root = NULL;
    2285      int i;      int i;
    2286        int j;
    2287    
    2288      printf("index=%d\n", index);      printf("index=%d\n", index);
    2289    
    # Line 2349  void displayEntry(struct singleEntry * e Line 2371  void displayEntry(struct singleEntry * e
    2371      } else {      } else {
    2372   char * title;   char * title;
    2373   line = getLineByType(LT_MENUENTRY, entry->lines);   line = getLineByType(LT_MENUENTRY, entry->lines);
    2374   title = grub2ExtractTitle(line);   if (line) {
    2375   if (title)      title = grub2ExtractTitle(line);
    2376      printf("title=%s\n", title);      if (title)
    2377     printf("title=%s\n", title);
    2378     }
    2379        }
    2380    
    2381        for (j = 0, line = entry->lines; line; line = line->next) {
    2382     if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
    2383        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    2384     printf("mbmodule%d=", j);
    2385        else
    2386     printf("mbmodule%d=%s", j, prefix);
    2387    
    2388        for (i = 1; i < line->numElements; i++)
    2389     printf("%s%s", line->elements[i].item, line->elements[i].indent);
    2390        printf("\n");
    2391        j++;
    2392     }
    2393      }      }
    2394  }  }
    2395    
    # Line 3274  int updateImage(struct grubConfig * cfg, Line 3312  int updateImage(struct grubConfig * cfg,
    3312  }  }
    3313    
    3314  int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,  int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
    3315   const char * image, const char * prefix, const char * initrd) {   const char * image, const char * prefix, const char * initrd,
    3316     const char * title) {
    3317      struct singleEntry * entry;      struct singleEntry * entry;
    3318      struct singleLine * line, * kernelLine, *endLine = NULL;      struct singleLine * line, * kernelLine, *endLine = NULL;
    3319      int index = 0;      int index = 0;
    3320    
    3321      if (!image) return 0;      if (!image) return 0;
    3322    
    3323      for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
    3324          kernelLine = getLineByType(LT_MBMODULE, entry->lines);          kernelLine = getLineByType(LT_MBMODULE, entry->lines);
    3325          if (!kernelLine) continue;          if (!kernelLine) continue;
    3326    
    3327     /* if title is supplied, the entry's title must match it. */
    3328     if (title) {
    3329        char *linetitle;
    3330    
    3331        line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
    3332        if (!line)
    3333     continue;
    3334    
    3335        linetitle = extractTitle(line);
    3336        if (!linetitle)
    3337     continue;
    3338        if (strcmp(title, linetitle)) {
    3339     free(linetitle);
    3340     continue;
    3341        }
    3342        free(linetitle);
    3343     }
    3344    
    3345          if (prefix) {          if (prefix) {
    3346              int prefixLen = strlen(prefix);              int prefixLen = strlen(prefix);
    3347              if (!strncmp(initrd, prefix, prefixLen))              if (!strncmp(initrd, prefix, prefixLen))
    # Line 3310  int addMBInitrd(struct grubConfig * cfg, Line 3367  int addMBInitrd(struct grubConfig * cfg,
    3367  }  }
    3368    
    3369  int updateInitrd(struct grubConfig * cfg, const char * image,  int updateInitrd(struct grubConfig * cfg, const char * image,
    3370                   const char * prefix, const char * initrd) {                   const char * prefix, const char * initrd, const char * title) {
    3371      struct singleEntry * entry;      struct singleEntry * entry;
    3372      struct singleLine * line, * kernelLine, *endLine = NULL;      struct singleLine * line, * kernelLine, *endLine = NULL;
    3373      int index = 0;      int index = 0;
    # Line 3321  int updateInitrd(struct grubConfig * cfg Line 3378  int updateInitrd(struct grubConfig * cfg
    3378          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
    3379          if (!kernelLine) continue;          if (!kernelLine) continue;
    3380    
    3381     /* if title is supplied, the entry's title must match it. */
    3382     if (title) {
    3383        char *linetitle;
    3384    
    3385        line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
    3386        if (!line)
    3387     continue;
    3388    
    3389        linetitle = extractTitle(line);
    3390        if (!linetitle)
    3391     continue;
    3392        if (strcmp(title, linetitle)) {
    3393     free(linetitle);
    3394     continue;
    3395        }
    3396        free(linetitle);
    3397     }
    3398    
    3399          line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);          line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
    3400          if (line)          if (line)
    3401              removeLine(entry, line);              removeLine(entry, line);
    # Line 3705  int addNewKernel(struct grubConfig * con Line 3780  int addNewKernel(struct grubConfig * con
    3780   const char * newKernelPath, const char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
    3781   const char * newKernelArgs, const char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
    3782   const char ** extraInitrds, int extraInitrdCount,   const char ** extraInitrds, int extraInitrdCount,
    3783                   const char * newMBKernel, const char * newMBKernelArgs) {                   const char * newMBKernel, const char * newMBKernelArgs,
    3784     const char * newDevTreePath) {
    3785      struct singleEntry * new;      struct singleEntry * new;
    3786      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
    3787      int needs;      int needs;
    # Line 3746  int addNewKernel(struct grubConfig * con Line 3822  int addNewKernel(struct grubConfig * con
    3822          needs |= NEED_MB;          needs |= NEED_MB;
    3823          new->multiboot = 1;          new->multiboot = 1;
    3824      }      }
    3825        if (newDevTreePath && getKeywordByType(LT_DEVTREE, config->cfi))
    3826     needs |= NEED_DEVTREE;
    3827    
    3828      if (template) {      if (template) {
    3829   for (masterLine = template->lines;   for (masterLine = template->lines;
    # Line 3931  int addNewKernel(struct grubConfig * con Line 4009  int addNewKernel(struct grubConfig * con
    4009   newLine = addLineTmpl(new, tmplLine, newLine, NULL,   newLine = addLineTmpl(new, tmplLine, newLine, NULL,
    4010   config->cfi);   config->cfi);
    4011      }      }
    4012        } else if (tmplLine->type == LT_DEVTREE &&
    4013           tmplLine->numElements == 2 && newDevTreePath) {
    4014            newLine = addLineTmpl(new, tmplLine, newLine,
    4015          newDevTreePath + strlen(prefix),
    4016          config->cfi);
    4017     needs &= ~NEED_DEVTREE;
    4018        } else if (tmplLine->type == LT_ENTRY_END && needs & NEED_DEVTREE) {
    4019     const char *ndtp = newDevTreePath;
    4020     if (!strncmp(newDevTreePath, prefix, strlen(prefix)))
    4021        ndtp += strlen(prefix);
    4022     newLine = addLine(new, config->cfi, LT_DEVTREE,
    4023      config->secondaryIndent,
    4024      ndtp);
    4025     needs &= ~NEED_DEVTREE;
    4026     newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
    4027      } else {      } else {
    4028   /* pass through other lines from the template */   /* pass through other lines from the template */
    4029   newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);   newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
    # Line 4006  int addNewKernel(struct grubConfig * con Line 4099  int addNewKernel(struct grubConfig * con
    4099   }   }
    4100      }      }
    4101    
    4102        struct singleLine *endLine = NULL;
    4103        endLine = getLineByType(LT_ENTRY_END, new->lines);
    4104        if (endLine) {
    4105        removeLine(new, endLine);
    4106        needs |= NEED_END;
    4107        }
    4108    
    4109      /* add the remainder of the lines, i.e. those that either      /* add the remainder of the lines, i.e. those that either
    4110       * weren't present in the template, or in the case of no template,       * weren't present in the template, or in the case of no template,
    4111       * all the lines following the entryStart.       * all the lines following the entryStart.
    # Line 4051  int addNewKernel(struct grubConfig * con Line 4151  int addNewKernel(struct grubConfig * con
    4151   free(initrdVal);   free(initrdVal);
    4152   needs &= ~NEED_INITRD;   needs &= ~NEED_INITRD;
    4153      }      }
    4154        if (needs & NEED_DEVTREE) {
    4155     newLine = addLine(new, config->cfi, LT_DEVTREE,
    4156      config->secondaryIndent,
    4157      newDevTreePath);
    4158     needs &= ~NEED_DEVTREE;
    4159        }
    4160    
    4161        /* NEEDS_END must be last on bootloaders that need it... */
    4162      if (needs & NEED_END) {      if (needs & NEED_END) {
    4163   newLine = addLine(new, config->cfi, LT_ENTRY_END,   newLine = addLine(new, config->cfi, LT_ENTRY_END,
    4164   config->secondaryIndent, NULL);   config->secondaryIndent, NULL);
    # Line 4102  int main(int argc, const char ** argv) { Line 4210  int main(int argc, const char ** argv) {
    4210      char * newKernelArgs = NULL;      char * newKernelArgs = NULL;
    4211      char * newKernelInitrd = NULL;      char * newKernelInitrd = NULL;
    4212      char * newKernelTitle = NULL;      char * newKernelTitle = NULL;
    4213      char * newKernelVersion = NULL;      char * newDevTreePath = NULL;
    4214      char * newMBKernel = NULL;      char * newMBKernel = NULL;
    4215      char * newMBKernelArgs = NULL;      char * newMBKernelArgs = NULL;
    4216      char * removeMBKernelArgs = NULL;      char * removeMBKernelArgs = NULL;
    # Line 4160  int main(int argc, const char ** argv) { Line 4268  int main(int argc, const char ** argv) {
    4268      _("display the index of the default kernel") },      _("display the index of the default kernel") },
    4269   { "default-title", 0, 0, &displayDefaultTitle, 0,   { "default-title", 0, 0, &displayDefaultTitle, 0,
    4270      _("display the title of the default kernel") },      _("display the title of the default kernel") },
    4271     { "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0,
    4272        _("device tree file for new stanza"), _("dtb-path") },
    4273     { "devtreedir", 0, POPT_ARG_STRING, &newDevTreePath, 0,
    4274        _("device tree directory for new stanza"), _("dtb-path") },
    4275   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
    4276      _("configure elilo bootloader") },      _("configure elilo bootloader") },
    4277   { "efi", 0, POPT_ARG_NONE, &isEfi, 0,   { "efi", 0, POPT_ARG_NONE, &isEfi, 0,
    # Line 4325  int main(int argc, const char ** argv) { Line 4437  int main(int argc, const char ** argv) {
    4437      grubConfig = cfi->defaultConfig;      grubConfig = cfi->defaultConfig;
    4438      }      }
    4439    
    4440      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo ||
    4441      newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
    4442      defaultKernel || displayDefaultIndex || displayDefaultTitle ||      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
    4443      (defaultIndex >= 0))) {      (defaultIndex >= 0))) {
    # Line 4334  int main(int argc, const char ** argv) { Line 4446  int main(int argc, const char ** argv) {
    4446   return 1;   return 1;
    4447      }      }
    4448    
    4449      if ((displayDefault || kernelInfo) && (newKernelVersion || newKernelPath ||      if ((displayDefault || kernelInfo) && (newKernelPath ||
    4450     removeKernelPath)) {     removeKernelPath)) {
    4451   fprintf(stderr, _("grubby: --default-kernel and --info may not "   fprintf(stderr, _("grubby: --default-kernel and --info may not "
    4452    "be used when adding or removing kernels\n"));    "be used when adding or removing kernels\n"));
    # Line 4344  int main(int argc, const char ** argv) { Line 4456  int main(int argc, const char ** argv) {
    4456      if (newKernelPath && !newKernelTitle) {      if (newKernelPath && !newKernelTitle) {
    4457   fprintf(stderr, _("grubby: kernel title must be specified\n"));   fprintf(stderr, _("grubby: kernel title must be specified\n"));
    4458   return 1;   return 1;
    4459      } else if (!newKernelPath && (newKernelTitle  || copyDefault ||      } else if (!newKernelPath && (copyDefault ||
    4460    (newKernelInitrd && !updateKernelPath)||    (newKernelInitrd && !updateKernelPath)||
    4461    makeDefault || extraInitrdCount > 0)) {    makeDefault || extraInitrdCount > 0)) {
    4462   fprintf(stderr, _("grubby: kernel path expected\n"));   fprintf(stderr, _("grubby: kernel path expected\n"));
    # Line 4566  int main(int argc, const char ** argv) { Line 4678  int main(int argc, const char ** argv) {
    4678      if (updateKernelPath && newKernelInitrd) {      if (updateKernelPath && newKernelInitrd) {
    4679      if (newMBKernel) {      if (newMBKernel) {
    4680      if (addMBInitrd(config, newMBKernel, updateKernelPath,      if (addMBInitrd(config, newMBKernel, updateKernelPath,
    4681   bootPrefix, newKernelInitrd))   bootPrefix, newKernelInitrd,
    4682     newKernelTitle))
    4683      return 1;      return 1;
    4684      } else {      } else {
    4685      if (updateInitrd(config, updateKernelPath, bootPrefix,      if (updateInitrd(config, updateKernelPath, bootPrefix,
    4686   newKernelInitrd))   newKernelInitrd, newKernelTitle))
    4687   return 1;   return 1;
    4688      }      }
    4689      }      }
    4690      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
    4691                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
    4692                       (const char **)extraInitrds, extraInitrdCount,                       (const char **)extraInitrds, extraInitrdCount,
    4693                       newMBKernel, newMBKernelArgs)) return 1;                       newMBKernel, newMBKernelArgs, newDevTreePath)) return 1;
    4694            
    4695    
    4696      if (numEntries(config) == 0) {      if (numEntries(config) == 0) {
    Legend:
    Removed from v.2683  
    changed lines
      Added in v.2977