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 2682 by niro, Wed Jul 16 09:49:24 2014 UTC revision 2960 by niro, Wed Jun 29 14:07:59 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 90  enum lineType_e { Line 96  enum lineType_e {
    96      LT_SET_VARIABLE = 1 << 19,      LT_SET_VARIABLE = 1 << 19,
    97      LT_KERNEL_EFI   = 1 << 20,      LT_KERNEL_EFI   = 1 << 20,
    98      LT_INITRD_EFI   = 1 << 21,      LT_INITRD_EFI   = 1 << 21,
    99      LT_UNKNOWN      = 1 << 22,      LT_KERNEL_16    = 1 << 22,
    100        LT_INITRD_16    = 1 << 23,
    101        LT_DEVTREE      = 1 << 24,
    102        LT_UNKNOWN      = 1 << 25,
    103  };  };
    104    
    105  struct singleLine {  struct singleLine {
    # Line 119  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 151  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 223  struct keywordTypes grub2Keywords[] = { Line 234  struct keywordTypes grub2Keywords[] = {
    234      { "fallback",   LT_FALLBACK,    ' ' },      { "fallback",   LT_FALLBACK,    ' ' },
    235      { "linux",      LT_KERNEL,      ' ' },      { "linux",      LT_KERNEL,      ' ' },
    236      { "linuxefi",   LT_KERNEL_EFI,  ' ' },      { "linuxefi",   LT_KERNEL_EFI,  ' ' },
    237        { "linux16",    LT_KERNEL_16,   ' ' },
    238      { "initrd",     LT_INITRD,      ' ', ' ' },      { "initrd",     LT_INITRD,      ' ', ' ' },
    239      { "initrdefi",  LT_INITRD_EFI,  ' ', ' ' },      { "initrdefi",  LT_INITRD_EFI,  ' ', ' ' },
    240        { "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 398  static int isquote(char q) Line 412  static int isquote(char q)
    412  }  }
    413    
    414  static int iskernel(enum lineType_e type) {  static int iskernel(enum lineType_e type) {
    415      return (type == LT_KERNEL || type == LT_KERNEL_EFI);      return (type == LT_KERNEL || type == LT_KERNEL_EFI || type == LT_KERNEL_16);
    416  }  }
    417    
    418  static int isinitrd(enum lineType_e type) {  static int isinitrd(enum lineType_e type) {
    419      return (type == LT_INITRD || type == LT_INITRD_EFI);      return (type == LT_INITRD || type == LT_INITRD_EFI || type == LT_INITRD_16);
    420  }  }
    421    
    422  char *grub2ExtractTitle(struct singleLine * line) {  char *grub2ExtractTitle(struct singleLine * line) {
    # Line 623  struct configFileInfo extlinuxConfigType Line 637  struct configFileInfo extlinuxConfigType
    637      .needsBootPrefix = 1,      .needsBootPrefix = 1,
    638      .maxTitleLength = 255,      .maxTitleLength = 255,
    639      .mbAllowExtraInitRds = 1,      .mbAllowExtraInitRds = 1,
    640        .defaultIsUnquoted = 1,
    641  };  };
    642    
    643  struct grubConfig {  struct grubConfig {
    # Line 714  static enum lineType_e preferredLineType Line 729  static enum lineType_e preferredLineType
    729      if (isEfi && cfi == &grub2ConfigType) {      if (isEfi && cfi == &grub2ConfigType) {
    730   switch (type) {   switch (type) {
    731   case LT_KERNEL:   case LT_KERNEL:
    732      return LT_KERNEL_EFI;      return isEfiOnly ? LT_KERNEL : LT_KERNEL_EFI;
    733     case LT_INITRD:
    734        return isEfiOnly ? LT_INITRD : LT_INITRD_EFI;
    735     default:
    736        return type;
    737     }
    738    #if defined(__i386__) || defined(__x86_64__)
    739        } else if (cfi == &grub2ConfigType) {
    740     switch (type) {
    741     case LT_KERNEL:
    742        return LT_KERNEL_16;
    743   case LT_INITRD:   case LT_INITRD:
    744      return LT_INITRD_EFI;      return LT_INITRD_16;
    745   default:   default:
    746      return type;      return type;
    747   }   }
    748    #endif
    749      }      }
    750      return type;      return type;
    751  }  }
    # Line 1167  static struct grubConfig * readConfig(co Line 1193  static struct grubConfig * readConfig(co
    1193   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;   cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
    1194   defaultLine = line;   defaultLine = line;
    1195      }      }
      } else if (line->type == LT_DEFAULT && line->numElements == 2) {  
         cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;  
         defaultLine = line;  
    1196    
    1197          } else if (iskernel(line->type)) {          } else if (iskernel(line->type)) {
    1198      /* if by some freak chance this is multiboot and the "module"      /* if by some freak chance this is multiboot and the "module"
    1199       * lines came earlier in the template, make sure to use LT_HYPER       * lines came earlier in the template, make sure to use LT_HYPER
    1200       * instead of LT_KERNEL now       * instead of LT_KERNEL now
    1201       */       */
    1202      if (entry->multiboot)      if (entry && entry->multiboot)
    1203   line->type = LT_HYPER;   line->type = LT_HYPER;
    1204    
    1205          } else if (line->type == LT_MBMODULE) {          } else if (line->type == LT_MBMODULE) {
    # Line 1202  static struct grubConfig * readConfig(co Line 1225  static struct grubConfig * readConfig(co
    1225      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);      cfg->fallbackImage = strtol(line->elements[1].item, &end, 10);
    1226      if (*end) cfg->fallbackImage = -1;      if (*end) cfg->fallbackImage = -1;
    1227    
    1228   } else if (line->type == LT_TITLE && line->numElements > 1) {   } else if ((line->type == LT_DEFAULT && cfi->defaultIsUnquoted) ||
    1229      /* make the title a single argument (undoing our parsing) */                  (line->type == LT_TITLE && line->numElements > 1)) {
    1230        /* make the title/default a single argument (undoing our parsing) */
    1231      len = 0;      len = 0;
    1232      for (int i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    1233   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
    # Line 1310  static struct grubConfig * readConfig(co Line 1334  static struct grubConfig * readConfig(co
    1334      }      }
    1335   }   }
    1336    
    1337     if (line->type == LT_DEFAULT && line->numElements == 2) {
    1338        cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
    1339        defaultLine = line;
    1340     }
    1341    
    1342   /* If we find a generic config option which should live at the   /* If we find a generic config option which should live at the
    1343     top of the file, move it there. Old versions of grubby were     top of the file, move it there. Old versions of grubby were
    1344     probably responsible for putting new images in the wrong     probably responsible for putting new images in the wrong
    # Line 1807  int suitableImage(struct singleEntry * e Line 1836  int suitableImage(struct singleEntry * e
    1836   return 0;   return 0;
    1837      }      }
    1838    
    1839      line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);      line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
    1840      if (!line) {      if (!line) {
    1841   notSuitablePrintf(entry, 0, "no line found\n");   notSuitablePrintf(entry, 0, "no line found\n");
    1842   return 0;   return 0;
    # Line 1931  struct singleEntry * findEntryByPath(str Line 1960  struct singleEntry * findEntryByPath(str
    1960   }   }
    1961    
    1962   indexVars[i + 1] = -1;   indexVars[i + 1] = -1;
    1963    
    1964   i = 0;   i = 0;
    1965   if (index) {   if (index) {
    1966      while (i < *index) i++;      while (i < *index) {
    1967      if (indexVars[i] == -1) return NULL;   i++;
    1968     if (indexVars[i] == -1) return NULL;
    1969        }
    1970   }   }
    1971    
    1972   entry = findEntryByIndex(config, indexVars[i]);   entry = findEntryByIndex(config, indexVars[i]);
    1973   if (!entry) return NULL;   if (!entry) return NULL;
    1974    
    1975   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
    1976   if (!line) return NULL;   if (!line) return NULL;
    1977    
    1978   if (index) *index = indexVars[i];   if (index) *index = indexVars[i];
    # Line 1992  struct singleEntry * findEntryByPath(str Line 2023  struct singleEntry * findEntryByPath(str
    2023      for (line = entry->lines; line; line = line->next) {      for (line = entry->lines; line; line = line->next) {
    2024   enum lineType_e ct = checkType;   enum lineType_e ct = checkType;
    2025   if (entry->multiboot && checkType == LT_KERNEL)   if (entry->multiboot && checkType == LT_KERNEL)
    2026      ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER;      ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER|LT_KERNEL_16;
    2027   else if (checkType & LT_KERNEL)   else if (checkType & LT_KERNEL)
    2028      ct = checkType | LT_KERNEL_EFI;      ct = checkType | LT_KERNEL_EFI | LT_KERNEL_16;
    2029   line = getLineByType(ct, line);   line = getLineByType(ct, line);
    2030   if (!line)   if (!line)
    2031      break;  /* not found in this entry */      break;  /* not found in this entry */
    # Line 2016  struct singleEntry * findEntryByPath(str Line 2047  struct singleEntry * findEntryByPath(str
    2047       * non-Linux boot entries (could find netbsd etc, though, which is       * non-Linux boot entries (could find netbsd etc, though, which is
    2048       * unfortunate)       * unfortunate)
    2049       */       */
    2050      if (line && getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines))      if (line && getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines))
    2051   break; /* found 'im! */   break; /* found 'im! */
    2052   }   }
    2053    
    # Line 2089  struct singleEntry * findTemplate(struct Line 2120  struct singleEntry * findTemplate(struct
    2120   } else {   } else {
    2121      entry = findEntryByTitle(cfg, defTitle, &index);      entry = findEntryByTitle(cfg, defTitle, &index);
    2122   }   }
    2123   if (entry)   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
    2124      cfg->defaultImage = index;      cfg->defaultImage = index;
    2125        if (indexPtr)
    2126     *indexPtr = index;
    2127        return entry;
    2128     }
    2129      }      }
    2130   }   }
    2131      } else if (cfg->defaultImage > -1) {      } else if (cfg->defaultImage > -1) {
    # Line 2247  void displayEntry(struct singleEntry * e Line 2282  void displayEntry(struct singleEntry * e
    2282      struct singleLine * line;      struct singleLine * line;
    2283      char * root = NULL;      char * root = NULL;
    2284      int i;      int i;
    2285        int j;
    2286    
    2287      printf("index=%d\n", index);      printf("index=%d\n", index);
    2288    
    2289      line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);      line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
    2290      if (!line) {      if (!line) {
    2291          printf("non linux entry\n");          printf("non linux entry\n");
    2292          return;          return;
    # Line 2315  void displayEntry(struct singleEntry * e Line 2351  void displayEntry(struct singleEntry * e
    2351   printf("root=%s\n", s);   printf("root=%s\n", s);
    2352      }      }
    2353    
    2354      line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);      line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
    2355    
    2356      if (line && line->numElements >= 2) {      if (line && line->numElements >= 2) {
    2357   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    # Line 2338  void displayEntry(struct singleEntry * e Line 2374  void displayEntry(struct singleEntry * e
    2374   if (title)   if (title)
    2375      printf("title=%s\n", title);      printf("title=%s\n", title);
    2376      }      }
    2377    
    2378        for (j = 0, line = entry->lines; line; line = line->next) {
    2379     if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
    2380        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    2381     printf("mbmodule%d=", j);
    2382        else
    2383     printf("mbmodule%d=%s", j, prefix);
    2384    
    2385        for (i = 1; i < line->numElements; i++)
    2386     printf("%s%s", line->elements[i].item, line->elements[i].indent);
    2387        printf("\n");
    2388        j++;
    2389     }
    2390        }
    2391  }  }
    2392    
    2393  int isSuseSystem(void) {  int isSuseSystem(void) {
    # Line 2732  struct singleLine * addLineTmpl(struct s Line 2782  struct singleLine * addLineTmpl(struct s
    2782   insertElement(newLine, val, 1, cfi);   insertElement(newLine, val, 1, cfi);
    2783    
    2784   /* but try to keep the rootspec from the template... sigh */   /* but try to keep the rootspec from the template... sigh */
    2785   if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD|LT_KERNEL_EFI|LT_INITRD_EFI)) {   if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD|LT_KERNEL_EFI|LT_INITRD_EFI|LT_KERNEL_16|LT_INITRD_16)) {
    2786      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);
    2787      if (rootspec != NULL) {      if (rootspec != NULL) {
    2788   free(newLine->elements[1].item);   free(newLine->elements[1].item);
    # Line 3102  int updateActualImage(struct grubConfig Line 3152  int updateActualImage(struct grubConfig
    3152      firstElement = 2;      firstElement = 2;
    3153    
    3154   } else {   } else {
    3155      line = getLineByType(LT_KERNEL|LT_MBMODULE|LT_KERNEL_EFI, entry->lines);      line = getLineByType(LT_KERNEL|LT_MBMODULE|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
    3156      if (!line) {      if (!line) {
    3157   /* no LT_KERNEL or LT_MBMODULE in this entry? */   /* no LT_KERNEL or LT_MBMODULE in this entry? */
    3158   continue;   continue;
    # Line 3259  int updateImage(struct grubConfig * cfg, Line 3309  int updateImage(struct grubConfig * cfg,
    3309  }  }
    3310    
    3311  int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,  int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
    3312   const char * image, const char * prefix, const char * initrd) {   const char * image, const char * prefix, const char * initrd,
    3313     const char * title) {
    3314      struct singleEntry * entry;      struct singleEntry * entry;
    3315      struct singleLine * line, * kernelLine, *endLine = NULL;      struct singleLine * line, * kernelLine, *endLine = NULL;
    3316      int index = 0;      int index = 0;
    3317    
    3318      if (!image) return 0;      if (!image) return 0;
    3319    
    3320      for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
    3321          kernelLine = getLineByType(LT_MBMODULE, entry->lines);          kernelLine = getLineByType(LT_MBMODULE, entry->lines);
    3322          if (!kernelLine) continue;          if (!kernelLine) continue;
    3323    
    3324     /* if title is supplied, the entry's title must match it. */
    3325     if (title) {
    3326        line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
    3327        char *linetitle = extractTitle(line);
    3328    
    3329        if (!linetitle)
    3330     continue;
    3331        if (strcmp(title, linetitle)) {
    3332     free(linetitle);
    3333     continue;
    3334        }
    3335        free(linetitle);
    3336     }
    3337    
    3338          if (prefix) {          if (prefix) {
    3339              int prefixLen = strlen(prefix);              int prefixLen = strlen(prefix);
    3340              if (!strncmp(initrd, prefix, prefixLen))              if (!strncmp(initrd, prefix, prefixLen))
    # Line 3295  int addMBInitrd(struct grubConfig * cfg, Line 3360  int addMBInitrd(struct grubConfig * cfg,
    3360  }  }
    3361    
    3362  int updateInitrd(struct grubConfig * cfg, const char * image,  int updateInitrd(struct grubConfig * cfg, const char * image,
    3363                   const char * prefix, const char * initrd) {                   const char * prefix, const char * initrd, const char * title) {
    3364      struct singleEntry * entry;      struct singleEntry * entry;
    3365      struct singleLine * line, * kernelLine, *endLine = NULL;      struct singleLine * line, * kernelLine, *endLine = NULL;
    3366      int index = 0;      int index = 0;
    # Line 3303  int updateInitrd(struct grubConfig * cfg Line 3368  int updateInitrd(struct grubConfig * cfg
    3368      if (!image) return 0;      if (!image) return 0;
    3369    
    3370      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
    3371          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI, entry->lines);          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
    3372          if (!kernelLine) continue;          if (!kernelLine) continue;
    3373    
    3374          line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);   /* if title is supplied, the entry's title must match it. */
    3375     if (title) {
    3376        line = getLineByType(LT_TITLE|LT_MENUENTRY, entry->lines);
    3377        char *linetitle = extractTitle(line);
    3378    
    3379        if (!linetitle)
    3380     continue;
    3381        if (strcmp(title, linetitle)) {
    3382     free(linetitle);
    3383     continue;
    3384        }
    3385        free(linetitle);
    3386     }
    3387    
    3388            line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
    3389          if (line)          if (line)
    3390              removeLine(entry, line);              removeLine(entry, line);
    3391          if (prefix) {          if (prefix) {
    # Line 3317  int updateInitrd(struct grubConfig * cfg Line 3396  int updateInitrd(struct grubConfig * cfg
    3396   endLine = getLineByType(LT_ENTRY_END, entry->lines);   endLine = getLineByType(LT_ENTRY_END, entry->lines);
    3397   if (endLine)   if (endLine)
    3398      removeLine(entry, endLine);      removeLine(entry, endLine);
    3399          line = addLine(entry, cfg->cfi, preferredLineType(LT_INITRD, cfg->cfi),   enum lineType_e lt;
    3400   kernelLine->indent, initrd);   switch(kernelLine->type) {
    3401        case LT_KERNEL:
    3402            lt = LT_INITRD;
    3403     break;
    3404        case LT_KERNEL_EFI:
    3405            lt = LT_INITRD_EFI;
    3406     break;
    3407        case LT_KERNEL_16:
    3408            lt = LT_INITRD_16;
    3409     break;
    3410        default:
    3411            lt = preferredLineType(LT_INITRD, cfg->cfi);
    3412     }
    3413            line = addLine(entry, cfg->cfi, lt, kernelLine->indent, initrd);
    3414          if (!line)          if (!line)
    3415      return 1;      return 1;
    3416   if (endLine) {   if (endLine) {
    # Line 3677  int addNewKernel(struct grubConfig * con Line 3769  int addNewKernel(struct grubConfig * con
    3769   const char * newKernelPath, const char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
    3770   const char * newKernelArgs, const char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
    3771   const char ** extraInitrds, int extraInitrdCount,   const char ** extraInitrds, int extraInitrdCount,
    3772                   const char * newMBKernel, const char * newMBKernelArgs) {                   const char * newMBKernel, const char * newMBKernelArgs,
    3773     const char * newDevTreePath) {
    3774      struct singleEntry * new;      struct singleEntry * new;
    3775      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
    3776      int needs;      int needs;
    # Line 3718  int addNewKernel(struct grubConfig * con Line 3811  int addNewKernel(struct grubConfig * con
    3811          needs |= NEED_MB;          needs |= NEED_MB;
    3812          new->multiboot = 1;          new->multiboot = 1;
    3813      }      }
    3814        if (newDevTreePath && getKeywordByType(LT_DEVTREE, config->cfi))
    3815     needs |= NEED_DEVTREE;
    3816    
    3817      if (template) {      if (template) {
    3818   for (masterLine = template->lines;   for (masterLine = template->lines;
    # Line 3903  int addNewKernel(struct grubConfig * con Line 3998  int addNewKernel(struct grubConfig * con
    3998   newLine = addLineTmpl(new, tmplLine, newLine, NULL,   newLine = addLineTmpl(new, tmplLine, newLine, NULL,
    3999   config->cfi);   config->cfi);
    4000      }      }
    4001        } else if (tmplLine->type == LT_DEVTREE &&
    4002           tmplLine->numElements == 2 && newDevTreePath) {
    4003            newLine = addLineTmpl(new, tmplLine, newLine,
    4004          newDevTreePath + strlen(prefix),
    4005          config->cfi);
    4006     needs &= ~NEED_DEVTREE;
    4007        } else if (tmplLine->type == LT_ENTRY_END && needs & NEED_DEVTREE) {
    4008     const char *ndtp = newDevTreePath;
    4009     if (!strncmp(newDevTreePath, prefix, strlen(prefix)))
    4010        ndtp += strlen(prefix);
    4011     newLine = addLine(new, config->cfi, LT_DEVTREE,
    4012      config->secondaryIndent,
    4013      ndtp);
    4014     needs &= ~NEED_DEVTREE;
    4015     newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
    4016      } else {      } else {
    4017   /* pass through other lines from the template */   /* pass through other lines from the template */
    4018   newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);   newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
    # Line 3916  int addNewKernel(struct grubConfig * con Line 4026  int addNewKernel(struct grubConfig * con
    4026   switch (config->cfi->entryStart) {   switch (config->cfi->entryStart) {
    4027      case LT_KERNEL:      case LT_KERNEL:
    4028      case LT_KERNEL_EFI:      case LT_KERNEL_EFI:
    4029        case LT_KERNEL_16:
    4030   if (new->multiboot && config->cfi->mbHyperFirst) {   if (new->multiboot && config->cfi->mbHyperFirst) {
    4031      /* fall through to LT_HYPER */      /* fall through to LT_HYPER */
    4032   } else {   } else {
    # Line 3977  int addNewKernel(struct grubConfig * con Line 4088  int addNewKernel(struct grubConfig * con
    4088   }   }
    4089      }      }
    4090    
    4091        struct singleLine *endLine = NULL;
    4092        endLine = getLineByType(LT_ENTRY_END, new->lines);
    4093        if (endLine) {
    4094        removeLine(new, endLine);
    4095        needs |= NEED_END;
    4096        }
    4097    
    4098      /* add the remainder of the lines, i.e. those that either      /* add the remainder of the lines, i.e. those that either
    4099       * 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,
    4100       * all the lines following the entryStart.       * all the lines following the entryStart.
    # Line 4022  int addNewKernel(struct grubConfig * con Line 4140  int addNewKernel(struct grubConfig * con
    4140   free(initrdVal);   free(initrdVal);
    4141   needs &= ~NEED_INITRD;   needs &= ~NEED_INITRD;
    4142      }      }
    4143        if (needs & NEED_DEVTREE) {
    4144     newLine = addLine(new, config->cfi, LT_DEVTREE,
    4145      config->secondaryIndent,
    4146      newDevTreePath);
    4147     needs &= ~NEED_DEVTREE;
    4148        }
    4149    
    4150        /* NEEDS_END must be last on bootloaders that need it... */
    4151      if (needs & NEED_END) {      if (needs & NEED_END) {
    4152   newLine = addLine(new, config->cfi, LT_ENTRY_END,   newLine = addLine(new, config->cfi, LT_ENTRY_END,
    4153   config->secondaryIndent, NULL);   config->secondaryIndent, NULL);
    # Line 4073  int main(int argc, const char ** argv) { Line 4199  int main(int argc, const char ** argv) {
    4199      char * newKernelArgs = NULL;      char * newKernelArgs = NULL;
    4200      char * newKernelInitrd = NULL;      char * newKernelInitrd = NULL;
    4201      char * newKernelTitle = NULL;      char * newKernelTitle = NULL;
    4202      char * newKernelVersion = NULL;      char * newDevTreePath = NULL;
    4203      char * newMBKernel = NULL;      char * newMBKernel = NULL;
    4204      char * newMBKernelArgs = NULL;      char * newMBKernelArgs = NULL;
    4205      char * removeMBKernelArgs = NULL;      char * removeMBKernelArgs = NULL;
    # Line 4131  int main(int argc, const char ** argv) { Line 4257  int main(int argc, const char ** argv) {
    4257      _("display the index of the default kernel") },      _("display the index of the default kernel") },
    4258   { "default-title", 0, 0, &displayDefaultTitle, 0,   { "default-title", 0, 0, &displayDefaultTitle, 0,
    4259      _("display the title of the default kernel") },      _("display the title of the default kernel") },
    4260     { "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0,
    4261        _("device tree file for new stanza"), _("dtb-path") },
    4262   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
    4263      _("configure elilo bootloader") },      _("configure elilo bootloader") },
    4264   { "efi", 0, POPT_ARG_NONE, &isEfi, 0,   { "efi", 0, POPT_ARG_NONE, &isEfi, 0,
    # Line 4296  int main(int argc, const char ** argv) { Line 4424  int main(int argc, const char ** argv) {
    4424      grubConfig = cfi->defaultConfig;      grubConfig = cfi->defaultConfig;
    4425      }      }
    4426    
    4427      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo ||
    4428      newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
    4429      defaultKernel || displayDefaultIndex || displayDefaultTitle ||      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
    4430      (defaultIndex >= 0))) {      (defaultIndex >= 0))) {
    # Line 4305  int main(int argc, const char ** argv) { Line 4433  int main(int argc, const char ** argv) {
    4433   return 1;   return 1;
    4434      }      }
    4435    
    4436      if ((displayDefault || kernelInfo) && (newKernelVersion || newKernelPath ||      if ((displayDefault || kernelInfo) && (newKernelPath ||
    4437     removeKernelPath)) {     removeKernelPath)) {
    4438   fprintf(stderr, _("grubby: --default-kernel and --info may not "   fprintf(stderr, _("grubby: --default-kernel and --info may not "
    4439    "be used when adding or removing kernels\n"));    "be used when adding or removing kernels\n"));
    # Line 4315  int main(int argc, const char ** argv) { Line 4443  int main(int argc, const char ** argv) {
    4443      if (newKernelPath && !newKernelTitle) {      if (newKernelPath && !newKernelTitle) {
    4444   fprintf(stderr, _("grubby: kernel title must be specified\n"));   fprintf(stderr, _("grubby: kernel title must be specified\n"));
    4445   return 1;   return 1;
    4446      } else if (!newKernelPath && (newKernelTitle  || copyDefault ||      } else if (!newKernelPath && (copyDefault ||
    4447    (newKernelInitrd && !updateKernelPath)||    (newKernelInitrd && !updateKernelPath)||
    4448    makeDefault || extraInitrdCount > 0)) {    makeDefault || extraInitrdCount > 0)) {
    4449   fprintf(stderr, _("grubby: kernel path expected\n"));   fprintf(stderr, _("grubby: kernel path expected\n"));
    # Line 4474  int main(int argc, const char ** argv) { Line 4602  int main(int argc, const char ** argv) {
    4602   if (!entry) return 0;   if (!entry) return 0;
    4603   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
    4604    
    4605   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI, entry->lines);   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
    4606   if (!line) return 0;   if (!line) return 0;
    4607    
    4608          rootspec = getRootSpecifier(line->elements[1].item);          rootspec = getRootSpecifier(line->elements[1].item);
    # Line 4537  int main(int argc, const char ** argv) { Line 4665  int main(int argc, const char ** argv) {
    4665      if (updateKernelPath && newKernelInitrd) {      if (updateKernelPath && newKernelInitrd) {
    4666      if (newMBKernel) {      if (newMBKernel) {
    4667      if (addMBInitrd(config, newMBKernel, updateKernelPath,      if (addMBInitrd(config, newMBKernel, updateKernelPath,
    4668   bootPrefix, newKernelInitrd))   bootPrefix, newKernelInitrd,
    4669     newKernelTitle))
    4670      return 1;      return 1;
    4671      } else {      } else {
    4672      if (updateInitrd(config, updateKernelPath, bootPrefix,      if (updateInitrd(config, updateKernelPath, bootPrefix,
    4673   newKernelInitrd))   newKernelInitrd, newKernelTitle))
    4674   return 1;   return 1;
    4675      }      }
    4676      }      }
    4677      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
    4678                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
    4679                       (const char **)extraInitrds, extraInitrdCount,                       (const char **)extraInitrds, extraInitrdCount,
    4680                       newMBKernel, newMBKernelArgs)) return 1;                       newMBKernel, newMBKernelArgs, newDevTreePath)) return 1;
    4681            
    4682    
    4683      if (numEntries(config) == 0) {      if (numEntries(config) == 0) {
    Legend:
    Removed from v.2682  
    changed lines
      Added in v.2960