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 2258 by niro, Mon Oct 21 14:02:25 2013 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 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 182  const char *grubFindConfig(struct config Line 193  const char *grubFindConfig(struct config
    193   "/boot/grub/grub.conf",   "/boot/grub/grub.conf",
    194   "/boot/grub/menu.lst",   "/boot/grub/menu.lst",
    195   "/etc/grub.conf",   "/etc/grub.conf",
    196     "/boot/grub2/grub.cfg",
    197     "/boot/grub2-efi/grub.cfg",
    198   NULL   NULL
    199      };      };
    200      static int i = -1;      static int i = -1;
    # Line 221  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 273  static char *grub2GetEnv(struct configFi Line 289  static char *grub2GetEnv(struct configFi
    289      static char buf[1025];      static char buf[1025];
    290      char *s = NULL;      char *s = NULL;
    291      char *ret = NULL;      char *ret = NULL;
    292      char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv";      char *envFile = info->envFile ? info->envFile : "/boot/grub/grubenv";
    293      int rc = asprintf(&s, "grub2-editenv %s list | grep '^%s='", envFile, name);      int rc = asprintf(&s, "grub-editenv %s list | grep '^%s='", envFile, name);
    294    
    295      if (rc < 0)      if (rc < 0)
    296   return NULL;   return NULL;
    # Line 338  static int grub2SetEnv(struct configFile Line 354  static int grub2SetEnv(struct configFile
    354  {  {
    355      char *s = NULL;      char *s = NULL;
    356      int rc = 0;      int rc = 0;
    357      char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv";      char *envFile = info->envFile ? info->envFile : "/boot/grub/grubenv";
    358    
    359      unquote(value);      unquote(value);
    360      value = shellEscape(value);      value = shellEscape(value);
    361      if (!value)      if (!value)
    362      return -1;      return -1;
    363    
    364      rc = asprintf(&s, "grub2-editenv %s set '%s=%s'", envFile, name, value);      rc = asprintf(&s, "grub-editenv %s set '%s=%s'", envFile, name, value);
    365      free(value);      free(value);
    366      if (rc <0)      if (rc <0)
    367   return -1;   return -1;
    # Line 396  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 566  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 621  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 712  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:
    736        return isEfiOnly ? LT_INITRD : LT_INITRD_EFI;
    737     default:
    738        return type;
    739     }
    740    #if defined(__i386__) || defined(__x86_64__)
    741        } else if (cfi == &grub2ConfigType) {
    742     switch (type) {
    743     case LT_KERNEL:
    744        return LT_KERNEL_16;
    745   case LT_INITRD:   case LT_INITRD:
    746      return LT_INITRD_EFI;      return LT_INITRD_16;
    747   default:   default:
    748      return type;      return type;
    749   }   }
    750    #endif
    751      }      }
    752      return type;      return type;
    753  }  }
    # Line 799  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 1165  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 1200  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 1308  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 1805  int suitableImage(struct singleEntry * e Line 1837  int suitableImage(struct singleEntry * e
    1837   return 0;   return 0;
    1838      }      }
    1839    
    1840      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);
    1841      if (!line) {      if (!line) {
    1842   notSuitablePrintf(entry, 0, "no line found\n");   notSuitablePrintf(entry, 0, "no line found\n");
    1843   return 0;   return 0;
    # Line 1929  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]);
    1974   if (!entry) return NULL;   if (!entry) return NULL;
    1975    
    1976   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);
    1977   if (!line) return NULL;   if (!line) return NULL;
    1978    
    1979   if (index) *index = indexVars[i];   if (index) *index = indexVars[i];
    # Line 1990  struct singleEntry * findEntryByPath(str Line 2024  struct singleEntry * findEntryByPath(str
    2024      for (line = entry->lines; line; line = line->next) {      for (line = entry->lines; line; line = line->next) {
    2025   enum lineType_e ct = checkType;   enum lineType_e ct = checkType;
    2026   if (entry->multiboot && checkType == LT_KERNEL)   if (entry->multiboot && checkType == LT_KERNEL)
    2027      ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER;      ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER|LT_KERNEL_16;
    2028   else if (checkType & LT_KERNEL)   else if (checkType & LT_KERNEL)
    2029      ct = checkType | LT_KERNEL_EFI;      ct = checkType | LT_KERNEL_EFI | LT_KERNEL_16;
    2030   line = getLineByType(ct, line);   line = getLineByType(ct, line);
    2031   if (!line)   if (!line)
    2032      break;  /* not found in this entry */      break;  /* not found in this entry */
    # Line 2014  struct singleEntry * findEntryByPath(str Line 2048  struct singleEntry * findEntryByPath(str
    2048       * non-Linux boot entries (could find netbsd etc, though, which is       * non-Linux boot entries (could find netbsd etc, though, which is
    2049       * unfortunate)       * unfortunate)
    2050       */       */
    2051      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))
    2052   break; /* found 'im! */   break; /* found 'im! */
    2053   }   }
    2054    
    # Line 2087  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 2245  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    
    2290      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);
    2291      if (!line) {      if (!line) {
    2292          printf("non linux entry\n");          printf("non linux entry\n");
    2293          return;          return;
    # Line 2313  void displayEntry(struct singleEntry * e Line 2352  void displayEntry(struct singleEntry * e
    2352   printf("root=%s\n", s);   printf("root=%s\n", s);
    2353      }      }
    2354    
    2355      line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);      line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
    2356    
    2357      if (line && line->numElements >= 2) {      if (line && line->numElements >= 2) {
    2358   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    # Line 2332  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 2730  struct singleLine * addLineTmpl(struct s Line 2785  struct singleLine * addLineTmpl(struct s
    2785   insertElement(newLine, val, 1, cfi);   insertElement(newLine, val, 1, cfi);
    2786    
    2787   /* but try to keep the rootspec from the template... sigh */   /* but try to keep the rootspec from the template... sigh */
    2788   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)) {
    2789      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);
    2790      if (rootspec != NULL) {      if (rootspec != NULL) {
    2791   free(newLine->elements[1].item);   free(newLine->elements[1].item);
    # Line 3100  int updateActualImage(struct grubConfig Line 3155  int updateActualImage(struct grubConfig
    3155      firstElement = 2;      firstElement = 2;
    3156    
    3157   } else {   } else {
    3158      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);
    3159      if (!line) {      if (!line) {
    3160   /* no LT_KERNEL or LT_MBMODULE in this entry? */   /* no LT_KERNEL or LT_MBMODULE in this entry? */
    3161   continue;   continue;
    # Line 3256  int updateImage(struct grubConfig * cfg, Line 3311  int updateImage(struct grubConfig * cfg,
    3311      return rc;      return rc;
    3312  }  }
    3313    
    3314    int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
    3315     const char * image, const char * prefix, const char * initrd,
    3316     const char * title) {
    3317        struct singleEntry * entry;
    3318        struct singleLine * line, * kernelLine, *endLine = NULL;
    3319        int index = 0;
    3320    
    3321        if (!image) return 0;
    3322    
    3323        for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
    3324            kernelLine = getLineByType(LT_MBMODULE, entry->lines);
    3325            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) {
    3346                int prefixLen = strlen(prefix);
    3347                if (!strncmp(initrd, prefix, prefixLen))
    3348                    initrd += prefixLen;
    3349            }
    3350     endLine = getLineByType(LT_ENTRY_END, entry->lines);
    3351     if (endLine)
    3352        removeLine(entry, endLine);
    3353            line = addLine(entry, cfg->cfi, preferredLineType(LT_MBMODULE,cfg->cfi),
    3354     kernelLine->indent, initrd);
    3355            if (!line)
    3356        return 1;
    3357     if (endLine) {
    3358        line = addLine(entry, cfg->cfi, LT_ENTRY_END, "", NULL);
    3359                if (!line)
    3360     return 1;
    3361     }
    3362    
    3363            break;
    3364        }
    3365    
    3366        return 0;
    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 3265  int updateInitrd(struct grubConfig * cfg Line 3375  int updateInitrd(struct grubConfig * cfg
    3375      if (!image) return 0;      if (!image) return 0;
    3376    
    3377      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
    3378          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI, entry->lines);          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
    3379          if (!kernelLine) continue;          if (!kernelLine) continue;
    3380    
    3381          line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);   /* 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);
    3400          if (line)          if (line)
    3401              removeLine(entry, line);              removeLine(entry, line);
    3402          if (prefix) {          if (prefix) {
    # Line 3279  int updateInitrd(struct grubConfig * cfg Line 3407  int updateInitrd(struct grubConfig * cfg
    3407   endLine = getLineByType(LT_ENTRY_END, entry->lines);   endLine = getLineByType(LT_ENTRY_END, entry->lines);
    3408   if (endLine)   if (endLine)
    3409      removeLine(entry, endLine);      removeLine(entry, endLine);
    3410          line = addLine(entry, cfg->cfi, preferredLineType(LT_INITRD, cfg->cfi),   enum lineType_e lt;
    3411   kernelLine->indent, initrd);   switch(kernelLine->type) {
    3412        case LT_KERNEL:
    3413            lt = LT_INITRD;
    3414     break;
    3415        case LT_KERNEL_EFI:
    3416            lt = LT_INITRD_EFI;
    3417     break;
    3418        case LT_KERNEL_16:
    3419            lt = LT_INITRD_16;
    3420     break;
    3421        default:
    3422            lt = preferredLineType(LT_INITRD, cfg->cfi);
    3423     }
    3424            line = addLine(entry, cfg->cfi, lt, kernelLine->indent, initrd);
    3425          if (!line)          if (!line)
    3426      return 1;      return 1;
    3427   if (endLine) {   if (endLine) {
    # Line 3639  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 3680  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 3865  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 3878  int addNewKernel(struct grubConfig * con Line 4037  int addNewKernel(struct grubConfig * con
    4037   switch (config->cfi->entryStart) {   switch (config->cfi->entryStart) {
    4038      case LT_KERNEL:      case LT_KERNEL:
    4039      case LT_KERNEL_EFI:      case LT_KERNEL_EFI:
    4040        case LT_KERNEL_16:
    4041   if (new->multiboot && config->cfi->mbHyperFirst) {   if (new->multiboot && config->cfi->mbHyperFirst) {
    4042      /* fall through to LT_HYPER */      /* fall through to LT_HYPER */
    4043   } else {   } else {
    # Line 3939  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 3984  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 4035  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 4093  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 4258  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 4267  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 4277  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 4436  int main(int argc, const char ** argv) { Line 4615  int main(int argc, const char ** argv) {
    4615   if (!entry) return 0;   if (!entry) return 0;
    4616   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
    4617    
    4618   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);
    4619   if (!line) return 0;   if (!line) return 0;
    4620    
    4621          rootspec = getRootSpecifier(line->elements[1].item);          rootspec = getRootSpecifier(line->elements[1].item);
    # Line 4497  int main(int argc, const char ** argv) { Line 4676  int main(int argc, const char ** argv) {
    4676      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
    4677                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
    4678      if (updateKernelPath && newKernelInitrd) {      if (updateKernelPath && newKernelInitrd) {
    4679              if (updateInitrd(config, updateKernelPath, bootPrefix,      if (newMBKernel) {
    4680                               newKernelInitrd)) return 1;      if (addMBInitrd(config, newMBKernel, updateKernelPath,
    4681     bootPrefix, newKernelInitrd,
    4682     newKernelTitle))
    4683        return 1;
    4684        } else {
    4685        if (updateInitrd(config, updateKernelPath, bootPrefix,
    4686     newKernelInitrd, newKernelTitle))
    4687     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.2258  
    changed lines
      Added in v.2977