Magellan Linux

  • Back to homepage
    • /[magellan-source]/tags/grubby-8_40_20170627/grubby.c

    Diff of /tags/grubby-8_40_20170627/grubby.c

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2056 by niro, Wed Feb 20 14:04:28 2013 UTC revision 2709 by niro, Wed Jul 16 10:57:06 2014 UTC
    # Line 36  Line 36 
    36  #include <signal.h>  #include <signal.h>
    37  #include <blkid/blkid.h>  #include <blkid/blkid.h>
    38    
    39    #include "log.h"
    40    
    41  #ifndef DEBUG  #ifndef DEBUG
    42  #define DEBUG 0  #define DEBUG 0
    43  #endif  #endif
    # Line 58  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;
    70    
    71  /* comments get lumped in with indention */  /* comments get lumped in with indention */
    72  struct lineElement {  struct lineElement {
    73      char * item;      char * item;
    # Line 86  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 115  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 132  struct configFileInfo; Line 146  struct configFileInfo;
    146  typedef const char *(*findConfigFunc)(struct configFileInfo *);  typedef const char *(*findConfigFunc)(struct configFileInfo *);
    147  typedef const int (*writeLineFunc)(struct configFileInfo *,  typedef const int (*writeLineFunc)(struct configFileInfo *,
    148   struct singleLine *line);   struct singleLine *line);
    149    typedef char *(*getEnvFunc)(struct configFileInfo *, char *name);
    150    typedef int (*setEnvFunc)(struct configFileInfo *, char *name, char *value);
    151    
    152  struct configFileInfo {  struct configFileInfo {
    153      char * defaultConfig;      char * defaultConfig;
    154      findConfigFunc findConfig;      findConfigFunc findConfig;
    155      writeLineFunc writeLine;      writeLineFunc writeLine;
    156        getEnvFunc getEnv;
    157        setEnvFunc setEnv;
    158      struct keywordTypes * keywords;      struct keywordTypes * keywords;
    159      int caseInsensitive;      int caseInsensitive;
    160      int defaultIsIndex;      int defaultIsIndex;
    161      int defaultIsVariable;      int defaultIsVariable;
    162      int defaultSupportSaved;      int defaultSupportSaved;
    163        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 153  struct configFileInfo { Line 173  struct configFileInfo {
    173      int mbInitRdIsModule;      int mbInitRdIsModule;
    174      int mbConcatArgs;      int mbConcatArgs;
    175      int mbAllowExtraInitRds;      int mbAllowExtraInitRds;
    176        char *envFile;
    177  };  };
    178    
    179  struct keywordTypes grubKeywords[] = {  struct keywordTypes grubKeywords[] = {
    # Line 172  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 211  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 226  const char *grub2FindConfig(struct confi Line 252  const char *grub2FindConfig(struct confi
    252      };      };
    253      static int i = -1;      static int i = -1;
    254      static const char *grub_cfg = "/boot/grub/grub.cfg";      static const char *grub_cfg = "/boot/grub/grub.cfg";
    255        int rc = -1;
    256    
    257      if (i == -1) {      if (i == -1) {
    258   for (i = 0; configFiles[i] != NULL; i++) {   for (i = 0; configFiles[i] != NULL; i++) {
    259      dbgPrintf("Checking \"%s\": ", configFiles[i]);      dbgPrintf("Checking \"%s\": ", configFiles[i]);
    260      if (!access(configFiles[i], R_OK)) {      if ((rc = access(configFiles[i], R_OK))) {
    261     if (errno == EACCES) {
    262        printf("Unable to access bootloader configuration file "
    263           "\"%s\": %m\n", configFiles[i]);
    264        exit(1);
    265     }
    266     continue;
    267        } else {
    268   dbgPrintf("found\n");   dbgPrintf("found\n");
    269   return configFiles[i];   return configFiles[i];
    270      }      }
    # Line 249  const char *grub2FindConfig(struct confi Line 283  const char *grub2FindConfig(struct confi
    283      return configFiles[i];      return configFiles[i];
    284  }  }
    285    
    286    /* kind of hacky.  It'll give the first 1024 bytes, ish. */
    287    static char *grub2GetEnv(struct configFileInfo *info, char *name)
    288    {
    289        static char buf[1025];
    290        char *s = NULL;
    291        char *ret = NULL;
    292        char *envFile = info->envFile ? info->envFile : "/boot/grub/grubenv";
    293        int rc = asprintf(&s, "grub-editenv %s list | grep '^%s='", envFile, name);
    294    
    295        if (rc < 0)
    296     return NULL;
    297    
    298        FILE *f = popen(s, "r");
    299        if (!f)
    300     goto out;
    301    
    302        memset(buf, '\0', sizeof (buf));
    303        ret = fgets(buf, 1024, f);
    304        pclose(f);
    305    
    306        if (ret) {
    307     ret += strlen(name) + 1;
    308     ret[strlen(ret) - 1] = '\0';
    309        }
    310        dbgPrintf("grub2GetEnv(%s): %s\n", name, ret);
    311    out:
    312        free(s);
    313        return ret;
    314    }
    315    
    316    static int sPopCount(const char *s, const char *c)
    317    {
    318        int ret = 0;
    319        if (!s)
    320     return -1;
    321        for (int i = 0; s[i] != '\0'; i++)
    322     for (int j = 0; c[j] != '\0'; j++)
    323        if (s[i] == c[j])
    324     ret++;
    325        return ret;
    326    }
    327    
    328    static char *shellEscape(const char *s)
    329    {
    330        int l = strlen(s) + sPopCount(s, "'") * 2;
    331    
    332        char *ret = calloc(l+1, sizeof (*ret));
    333        if (!ret)
    334     return NULL;
    335        for (int i = 0, j = 0; s[i] != '\0'; i++, j++) {
    336     if (s[i] == '\'')
    337        ret[j++] = '\\';
    338     ret[j] = s[i];
    339        }
    340        return ret;
    341    }
    342    
    343    static void unquote(char *s)
    344    {
    345        int l = strlen(s);
    346    
    347        if ((s[l-1] == '\'' && s[0] == '\'') || (s[l-1] == '"' && s[0] == '"')) {
    348     memmove(s, s+1, l-2);
    349     s[l-2] = '\0';
    350        }
    351    }
    352    
    353    static int grub2SetEnv(struct configFileInfo *info, char *name, char *value)
    354    {
    355        char *s = NULL;
    356        int rc = 0;
    357        char *envFile = info->envFile ? info->envFile : "/boot/grub/grubenv";
    358    
    359        unquote(value);
    360        value = shellEscape(value);
    361        if (!value)
    362        return -1;
    363    
    364        rc = asprintf(&s, "grub-editenv %s set '%s=%s'", envFile, name, value);
    365        free(value);
    366        if (rc <0)
    367     return -1;
    368    
    369        dbgPrintf("grub2SetEnv(%s): %s\n", name, s);
    370        rc = system(s);
    371        free(s);
    372        return rc;
    373    }
    374    
    375    /* this is a gigantic hack to avoid clobbering grub2 variables... */
    376    static int is_special_grub2_variable(const char *name)
    377    {
    378        if (!strcmp(name,"\"${next_entry}\""))
    379     return 1;
    380        if (!strcmp(name,"\"${prev_saved_entry}\""))
    381     return 1;
    382        return 0;
    383    }
    384    
    385  int sizeOfSingleLine(struct singleLine * line) {  int sizeOfSingleLine(struct singleLine * line) {
    386    int count = 0;    int count = 0;
    387    
    # Line 279  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 343  char *grub2ExtractTitle(struct singleLin Line 476  char *grub2ExtractTitle(struct singleLin
    476    
    477  struct configFileInfo grub2ConfigType = {  struct configFileInfo grub2ConfigType = {
    478      .findConfig = grub2FindConfig,      .findConfig = grub2FindConfig,
    479        .getEnv = grub2GetEnv,
    480        .setEnv = grub2SetEnv,
    481      .keywords = grub2Keywords,      .keywords = grub2Keywords,
    482      .defaultIsIndex = 1,      .defaultIsIndex = 1,
    483      .defaultSupportSaved = 1,      .defaultSupportSaved = 1,
    # Line 502  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 522  struct singleEntry * findEntryByIndex(st Line 658  struct singleEntry * findEntryByIndex(st
    658  struct singleEntry * findEntryByPath(struct grubConfig * cfg,  struct singleEntry * findEntryByPath(struct grubConfig * cfg,
    659       const char * path, const char * prefix,       const char * path, const char * prefix,
    660       int * index);       int * index);
    661    struct singleEntry * findEntryByTitle(struct grubConfig * cfg, char *title,
    662          int * index);
    663  static int readFile(int fd, char ** bufPtr);  static int readFile(int fd, char ** bufPtr);
    664  static void lineInit(struct singleLine * line);  static void lineInit(struct singleLine * line);
    665  struct singleLine * lineDup(struct singleLine * line);  struct singleLine * lineDup(struct singleLine * line);
    # Line 591  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:   case LT_INITRD:
    734      return LT_INITRD_EFI;      return isEfiOnly ? LT_INITRD : LT_INITRD_EFI;
    735   default:   default:
    736      return type;      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:
    744        return LT_INITRD_16;
    745     default:
    746        return type;
    747     }
    748    #endif
    749      }      }
    750      return type;      return type;
    751  }  }
    # Line 679  static int isEntryStart(struct singleLin Line 828  static int isEntryStart(struct singleLin
    828  /* extract the title from within brackets (for zipl) */  /* extract the title from within brackets (for zipl) */
    829  static char * extractTitle(struct singleLine * line) {  static char * extractTitle(struct singleLine * line) {
    830      /* bracketed title... let's extract it (leaks a byte) */      /* bracketed title... let's extract it (leaks a byte) */
    831      char * title;      char * title = NULL;
    832      title = strdup(line->elements[0].item);      if (line->type == LT_TITLE) {
    833      title++;   title = strdup(line->elements[0].item);
    834      *(title + strlen(title) - 1) = '\0';   title++;
    835     *(title + strlen(title) - 1) = '\0';
    836        } else if (line->type == LT_MENUENTRY)
    837     title = strdup(line->elements[1].item);
    838        else
    839     return NULL;
    840      return title;      return title;
    841  }  }
    842    
    # Line 940  static int getNextLine(char ** bufPtr, s Line 1094  static int getNextLine(char ** bufPtr, s
    1094      return 0;      return 0;
    1095  }  }
    1096    
    1097    static int isnumber(const char *s)
    1098    {
    1099        int i;
    1100        for (i = 0; s[i] != '\0'; i++)
    1101     if (s[i] < '0' || s[i] > '9')
    1102        return 0;
    1103        return i;
    1104    }
    1105    
    1106  static struct grubConfig * readConfig(const char * inName,  static struct grubConfig * readConfig(const char * inName,
    1107        struct configFileInfo * cfi) {        struct configFileInfo * cfi) {
    1108      int in;      int in;
    # Line 954  static struct grubConfig * readConfig(co Line 1117  static struct grubConfig * readConfig(co
    1117      int len;      int len;
    1118      char * buf;      char * buf;
    1119    
    1120      if (!strcmp(inName, "-")) {      if (inName == NULL) {
    1121            printf("Could not find bootloader configuration\n");
    1122            exit(1);
    1123        } else if (!strcmp(inName, "-")) {
    1124   in = 0;   in = 0;
    1125      } else {      } else {
    1126   if ((in = open(inName, O_RDONLY)) < 0) {   if ((in = open(inName, O_RDONLY)) < 0) {
    # Line 1021  static struct grubConfig * readConfig(co Line 1187  static struct grubConfig * readConfig(co
    1187      dbgPrintf("\n");      dbgPrintf("\n");
    1188      struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);      struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
    1189      if (kwType && line->numElements == 3 &&      if (kwType && line->numElements == 3 &&
    1190      !strcmp(line->elements[1].item, kwType->key)) {      !strcmp(line->elements[1].item, kwType->key) &&
    1191        !is_special_grub2_variable(line->elements[2].item)) {
    1192   dbgPrintf("Line sets default config\n");   dbgPrintf("Line sets default config\n");
    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 1061  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 1169  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 1226  static struct grubConfig * readConfig(co Line 1396  static struct grubConfig * readConfig(co
    1396          if (defaultLine->numElements > 2 &&          if (defaultLine->numElements > 2 &&
    1397      cfi->defaultSupportSaved &&      cfi->defaultSupportSaved &&
    1398      !strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {      !strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {
    1399      cfg->defaultImage = DEFAULT_SAVED_GRUB2;   cfg->cfi->defaultIsSaved = 1;
    1400     cfg->defaultImage = DEFAULT_SAVED_GRUB2;
    1401     if (cfg->cfi->getEnv) {
    1402        char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
    1403        if (defTitle) {
    1404     int index = 0;
    1405     if (isnumber(defTitle)) {
    1406        index = atoi(defTitle);
    1407        entry = findEntryByIndex(cfg, index);
    1408     } else {
    1409        entry = findEntryByTitle(cfg, defTitle, &index);
    1410     }
    1411     if (entry)
    1412        cfg->defaultImage = index;
    1413        }
    1414     }
    1415   } else if (cfi->defaultIsVariable) {   } else if (cfi->defaultIsVariable) {
    1416      char *value = defaultLine->elements[2].item;      char *value = defaultLine->elements[2].item;
    1417      while (*value && (*value == '"' || *value == '\'' ||      while (*value && (*value == '"' || *value == '\'' ||
    # Line 1267  static struct grubConfig * readConfig(co Line 1452  static struct grubConfig * readConfig(co
    1452          cfg->defaultImage = -1;          cfg->defaultImage = -1;
    1453      }      }
    1454   }   }
    1455        } else if (cfg->cfi->defaultIsSaved && cfg->cfi->getEnv) {
    1456     char *defTitle = cfi->getEnv(cfg->cfi, "saved_entry");
    1457     if (defTitle) {
    1458        int index = 0;
    1459        if (isnumber(defTitle)) {
    1460     index = atoi(defTitle);
    1461     entry = findEntryByIndex(cfg, index);
    1462        } else {
    1463     entry = findEntryByTitle(cfg, defTitle, &index);
    1464        }
    1465        if (entry)
    1466     cfg->defaultImage = index;
    1467     }
    1468      } else {      } else {
    1469          cfg->defaultImage = 0;          cfg->defaultImage = 0;
    1470      }      }
    # Line 1284  static void writeDefault(FILE * out, cha Line 1482  static void writeDefault(FILE * out, cha
    1482    
    1483      if (cfg->defaultImage == DEFAULT_SAVED)      if (cfg->defaultImage == DEFAULT_SAVED)
    1484   fprintf(out, "%sdefault%ssaved\n", indent, separator);   fprintf(out, "%sdefault%ssaved\n", indent, separator);
    1485      else if (cfg->defaultImage == DEFAULT_SAVED_GRUB2)      else if (cfg->cfi->defaultIsSaved) {
    1486   fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);   fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
    1487      else if (cfg->defaultImage > -1) {   if (cfg->defaultImage >= 0 && cfg->cfi->setEnv) {
    1488        char *title;
    1489        entry = findEntryByIndex(cfg, cfg->defaultImage);
    1490        line = getLineByType(LT_MENUENTRY, entry->lines);
    1491        if (!line)
    1492     line = getLineByType(LT_TITLE, entry->lines);
    1493        if (line) {
    1494     title = extractTitle(line);
    1495     if (title)
    1496        cfg->cfi->setEnv(cfg->cfi, "saved_entry", title);
    1497        }
    1498     }
    1499        } else if (cfg->defaultImage > -1) {
    1500   if (cfg->cfi->defaultIsIndex) {   if (cfg->cfi->defaultIsIndex) {
    1501      if (cfg->cfi->defaultIsVariable) {      if (cfg->cfi->defaultIsVariable) {
    1502          fprintf(out, "%sset default=\"%d\"\n", indent,          fprintf(out, "%sset default=\"%d\"\n", indent,
    # Line 1389  static int writeConfig(struct grubConfig Line 1599  static int writeConfig(struct grubConfig
    1599      while (line) {      while (line) {
    1600          if (line->type == LT_SET_VARIABLE && defaultKw &&          if (line->type == LT_SET_VARIABLE && defaultKw &&
    1601   line->numElements == 3 &&   line->numElements == 3 &&
    1602   !strcmp(line->elements[1].item, defaultKw->key)) {   !strcmp(line->elements[1].item, defaultKw->key) &&
    1603     !is_special_grub2_variable(line->elements[2].item)) {
    1604      writeDefault(out, line->indent, line->elements[0].indent, cfg);      writeDefault(out, line->indent, line->elements[0].indent, cfg);
    1605      needs &= ~MAIN_DEFAULT;      needs &= ~MAIN_DEFAULT;
    1606   } else if (line->type == LT_DEFAULT) {   } else if (line->type == LT_DEFAULT) {
    # Line 1534  static char *findDiskForRoot() Line 1745  static char *findDiskForRoot()
    1745      return NULL;      return NULL;
    1746  }  }
    1747    
    1748  void printEntry(struct singleEntry * entry) {  void printEntry(struct singleEntry * entry, FILE *f) {
    1749      int i;      int i;
    1750      struct singleLine * line;      struct singleLine * line;
    1751    
    1752      for (line = entry->lines; line; line = line->next) {      for (line = entry->lines; line; line = line->next) {
    1753   fprintf(stderr, "DBG: %s", line->indent);   log_message(f, "DBG: %s", line->indent);
    1754   for (i = 0; i < line->numElements; i++) {   for (i = 0; i < line->numElements; i++) {
    1755      /* Need to handle this, because we strip the quotes from      /* Need to handle this, because we strip the quotes from
    1756       * menuentry when read it. */       * menuentry when read it. */
    1757      if (line->type == LT_MENUENTRY && i == 1) {      if (line->type == LT_MENUENTRY && i == 1) {
    1758   if(!isquote(*line->elements[i].item))   if(!isquote(*line->elements[i].item))
    1759      fprintf(stderr, "\'%s\'", line->elements[i].item);      log_message(f, "\'%s\'", line->elements[i].item);
    1760   else   else
    1761      fprintf(stderr, "%s", line->elements[i].item);      log_message(f, "%s", line->elements[i].item);
    1762   fprintf(stderr, "%s", line->elements[i].indent);   log_message(f, "%s", line->elements[i].indent);
    1763    
    1764   continue;   continue;
    1765      }      }
    1766            
    1767      fprintf(stderr, "%s%s",      log_message(f, "%s%s",
    1768      line->elements[i].item, line->elements[i].indent);      line->elements[i].item, line->elements[i].indent);
    1769   }   }
    1770   fprintf(stderr, "\n");   log_message(f, "\n");
    1771      }      }
    1772  }  }
    1773    
    1774  void notSuitablePrintf(struct singleEntry * entry, const char *fmt, ...)  void notSuitablePrintf(struct singleEntry * entry, int okay, const char *fmt, ...)
    1775  {  {
    1776      va_list argp;      static int once;
    1777        va_list argp, argq;
    1778    
    1779        va_start(argp, fmt);
    1780    
    1781        va_copy(argq, argp);
    1782        if (!once) {
    1783     log_time(NULL);
    1784     log_message(NULL, "command line: %s\n", saved_command_line);
    1785        }
    1786        log_message(NULL, "DBG: Image entry %s: ", okay ? "succeeded" : "failed");
    1787        log_vmessage(NULL, fmt, argq);
    1788    
    1789        printEntry(entry, NULL);
    1790        va_end(argq);
    1791    
    1792      if (!debug)      if (!debug) {
    1793     once = 1;
    1794         va_end(argp);
    1795   return;   return;
    1796        }
    1797    
    1798      va_start(argp, fmt);      if (okay) {
    1799     va_end(argp);
    1800     return;
    1801        }
    1802    
    1803        if (!once)
    1804     log_message(stderr, "DBG: command line: %s\n", saved_command_line);
    1805        once = 1;
    1806      fprintf(stderr, "DBG: Image entry failed: ");      fprintf(stderr, "DBG: Image entry failed: ");
    1807      vfprintf(stderr, fmt, argp);      vfprintf(stderr, fmt, argp);
    1808      printEntry(entry);      printEntry(entry, stderr);
    1809      va_end(argp);      va_end(argp);
    1810  }  }
    1811    
    # Line 1597  int suitableImage(struct singleEntry * e Line 1832  int suitableImage(struct singleEntry * e
    1832      char * rootdev;      char * rootdev;
    1833    
    1834      if (skipRemoved && entry->skip) {      if (skipRemoved && entry->skip) {
    1835   notSuitablePrintf(entry, "marked to skip\n");   notSuitablePrintf(entry, 0, "marked to skip\n");
    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, "no line found\n");   notSuitablePrintf(entry, 0, "no line found\n");
    1842   return 0;   return 0;
    1843      }      }
    1844      if (line->numElements < 2) {      if (line->numElements < 2) {
    1845   notSuitablePrintf(entry, "line has only %d elements\n",   notSuitablePrintf(entry, 0, "line has only %d elements\n",
    1846      line->numElements);      line->numElements);
    1847   return 0;   return 0;
    1848      }      }
    1849    
    1850      if (flags & GRUBBY_BADIMAGE_OKAY) return 1;      if (flags & GRUBBY_BADIMAGE_OKAY) {
    1851        notSuitablePrintf(entry, 1, "\n");
    1852        return 1;
    1853        }
    1854    
    1855      fullName = alloca(strlen(bootPrefix) +      fullName = alloca(strlen(bootPrefix) +
    1856        strlen(line->elements[1].item) + 1);        strlen(line->elements[1].item) + 1);
    # Line 1623  int suitableImage(struct singleEntry * e Line 1861  int suitableImage(struct singleEntry * e
    1861      sprintf(fullName, "%s%s%s", bootPrefix, hasslash ? "" : "/",      sprintf(fullName, "%s%s%s", bootPrefix, hasslash ? "" : "/",
    1862              line->elements[1].item + rootspec_offset);              line->elements[1].item + rootspec_offset);
    1863      if (access(fullName, R_OK)) {      if (access(fullName, R_OK)) {
    1864   notSuitablePrintf(entry, "access to %s failed\n", fullName);   notSuitablePrintf(entry, 0, "access to %s failed\n", fullName);
    1865   return 0;   return 0;
    1866      }      }
    1867      for (i = 2; i < line->numElements; i++)      for (i = 2; i < line->numElements; i++)
    # Line 1644  int suitableImage(struct singleEntry * e Line 1882  int suitableImage(struct singleEntry * e
    1882    
    1883              /* failed to find one */              /* failed to find one */
    1884              if (!line) {              if (!line) {
    1885   notSuitablePrintf(entry, "no line found\n");   notSuitablePrintf(entry, 0, "no line found\n");
    1886   return 0;   return 0;
    1887              }              }
    1888    
    # Line 1653  int suitableImage(struct singleEntry * e Line 1891  int suitableImage(struct singleEntry * e
    1891      if (i < line->numElements)      if (i < line->numElements)
    1892          dev = line->elements[i].item + 5;          dev = line->elements[i].item + 5;
    1893      else {      else {
    1894   notSuitablePrintf(entry, "no root= entry found\n");   notSuitablePrintf(entry, 0, "no root= entry found\n");
    1895   /* it failed too...  can't find root= */   /* it failed too...  can't find root= */
    1896          return 0;          return 0;
    1897              }              }
    # Line 1662  int suitableImage(struct singleEntry * e Line 1900  int suitableImage(struct singleEntry * e
    1900    
    1901      dev = getpathbyspec(dev);      dev = getpathbyspec(dev);
    1902      if (!getpathbyspec(dev)) {      if (!getpathbyspec(dev)) {
    1903          notSuitablePrintf(entry, "can't find blkid entry for %s\n", dev);          notSuitablePrintf(entry, 0, "can't find blkid entry for %s\n", dev);
    1904          return 0;          return 0;
    1905      } else      } else
    1906   dev = getpathbyspec(dev);   dev = getpathbyspec(dev);
    1907    
    1908      rootdev = findDiskForRoot();      rootdev = findDiskForRoot();
    1909      if (!rootdev) {      if (!rootdev) {
    1910          notSuitablePrintf(entry, "can't find root device\n");          notSuitablePrintf(entry, 0, "can't find root device\n");
    1911   return 0;   return 0;
    1912      }      }
    1913    
    1914      if (!getuuidbydev(rootdev) || !getuuidbydev(dev)) {      if (!getuuidbydev(rootdev) || !getuuidbydev(dev)) {
    1915          notSuitablePrintf(entry, "uuid missing: rootdev %s, dev %s\n",          notSuitablePrintf(entry, 0, "uuid missing: rootdev %s, dev %s\n",
    1916   getuuidbydev(rootdev), getuuidbydev(dev));   getuuidbydev(rootdev), getuuidbydev(dev));
    1917          free(rootdev);          free(rootdev);
    1918          return 0;          return 0;
    1919      }      }
    1920    
    1921      if (strcmp(getuuidbydev(rootdev), getuuidbydev(dev))) {      if (strcmp(getuuidbydev(rootdev), getuuidbydev(dev))) {
    1922          notSuitablePrintf(entry, "uuid mismatch: rootdev %s, dev %s\n",          notSuitablePrintf(entry, 0, "uuid mismatch: rootdev %s, dev %s\n",
    1923   getuuidbydev(rootdev), getuuidbydev(dev));   getuuidbydev(rootdev), getuuidbydev(dev));
    1924   free(rootdev);   free(rootdev);
    1925          return 0;          return 0;
    1926      }      }
    1927    
    1928      free(rootdev);      free(rootdev);
    1929        notSuitablePrintf(entry, 1, "\n");
    1930    
    1931      return 1;      return 1;
    1932  }  }
    # Line 1731  struct singleEntry * findEntryByPath(str Line 1970  struct singleEntry * findEntryByPath(str
    1970   entry = findEntryByIndex(config, indexVars[i]);   entry = findEntryByIndex(config, indexVars[i]);
    1971   if (!entry) return NULL;   if (!entry) return NULL;
    1972    
    1973   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);
    1974   if (!line) return NULL;   if (!line) return NULL;
    1975    
    1976   if (index) *index = indexVars[i];   if (index) *index = indexVars[i];
    # Line 1782  struct singleEntry * findEntryByPath(str Line 2021  struct singleEntry * findEntryByPath(str
    2021      for (line = entry->lines; line; line = line->next) {      for (line = entry->lines; line; line = line->next) {
    2022   enum lineType_e ct = checkType;   enum lineType_e ct = checkType;
    2023   if (entry->multiboot && checkType == LT_KERNEL)   if (entry->multiboot && checkType == LT_KERNEL)
    2024      ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER;      ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER|LT_KERNEL_16;
    2025   else if (checkType & LT_KERNEL)   else if (checkType & LT_KERNEL)
    2026      ct = checkType | LT_KERNEL_EFI;      ct = checkType | LT_KERNEL_EFI | LT_KERNEL_16;
    2027   line = getLineByType(ct, line);   line = getLineByType(ct, line);
    2028   if (!line)   if (!line)
    2029      break;  /* not found in this entry */      break;  /* not found in this entry */
    # Line 1806  struct singleEntry * findEntryByPath(str Line 2045  struct singleEntry * findEntryByPath(str
    2045       * non-Linux boot entries (could find netbsd etc, though, which is       * non-Linux boot entries (could find netbsd etc, though, which is
    2046       * unfortunate)       * unfortunate)
    2047       */       */
    2048      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))
    2049   break; /* found 'im! */   break; /* found 'im! */
    2050   }   }
    2051    
    # Line 1816  struct singleEntry * findEntryByPath(str Line 2055  struct singleEntry * findEntryByPath(str
    2055      return entry;      return entry;
    2056  }  }
    2057    
    2058    struct singleEntry * findEntryByTitle(struct grubConfig * cfg, char *title,
    2059          int * index) {
    2060        struct singleEntry * entry;
    2061        struct singleLine * line;
    2062        int i;
    2063        char * newtitle;
    2064    
    2065        for (i = 0, entry = cfg->entries; entry; entry = entry->next, i++) {
    2066     if (index && i < *index)
    2067        continue;
    2068     line = getLineByType(LT_TITLE, entry->lines);
    2069     if (!line)
    2070        line = getLineByType(LT_MENUENTRY, entry->lines);
    2071     if (!line)
    2072        continue;
    2073     newtitle = grub2ExtractTitle(line);
    2074     if (!newtitle)
    2075        continue;
    2076     if (!strcmp(title, newtitle))
    2077        break;
    2078        }
    2079    
    2080        if (!entry)
    2081     return NULL;
    2082    
    2083        if (index)
    2084     *index = i;
    2085        return entry;
    2086    }
    2087    
    2088  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index) {  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index) {
    2089      struct singleEntry * entry;      struct singleEntry * entry;
    2090    
    # Line 1838  struct singleEntry * findTemplate(struct Line 2107  struct singleEntry * findTemplate(struct
    2107      struct singleEntry * entry, * entry2;      struct singleEntry * entry, * entry2;
    2108      int index;      int index;
    2109    
    2110      if (cfg->defaultImage > -1) {      if (cfg->cfi->defaultIsSaved) {
    2111     if (cfg->cfi->getEnv) {
    2112        char *defTitle = cfg->cfi->getEnv(cfg->cfi, "saved_entry");
    2113        if (defTitle) {
    2114     int index = 0;
    2115     if (isnumber(defTitle)) {
    2116        index = atoi(defTitle);
    2117        entry = findEntryByIndex(cfg, index);
    2118     } else {
    2119        entry = findEntryByTitle(cfg, defTitle, &index);
    2120     }
    2121     if (entry)
    2122        cfg->defaultImage = index;
    2123        }
    2124     }
    2125        } else if (cfg->defaultImage > -1) {
    2126   entry = findEntryByIndex(cfg, cfg->defaultImage);   entry = findEntryByIndex(cfg, cfg->defaultImage);
    2127   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
    2128      if (indexPtr) *indexPtr = cfg->defaultImage;      if (indexPtr) *indexPtr = cfg->defaultImage;
    # Line 1992  void displayEntry(struct singleEntry * e Line 2276  void displayEntry(struct singleEntry * e
    2276      struct singleLine * line;      struct singleLine * line;
    2277      char * root = NULL;      char * root = NULL;
    2278      int i;      int i;
    2279        int j;
    2280    
    2281      printf("index=%d\n", index);      printf("index=%d\n", index);
    2282    
    2283      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);
    2284      if (!line) {      if (!line) {
    2285          printf("non linux entry\n");          printf("non linux entry\n");
    2286          return;          return;
    # Line 2060  void displayEntry(struct singleEntry * e Line 2345  void displayEntry(struct singleEntry * e
    2345   printf("root=%s\n", s);   printf("root=%s\n", s);
    2346      }      }
    2347    
    2348      line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);      line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
    2349    
    2350      if (line && line->numElements >= 2) {      if (line && line->numElements >= 2) {
    2351   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    # Line 2083  void displayEntry(struct singleEntry * e Line 2368  void displayEntry(struct singleEntry * e
    2368   if (title)   if (title)
    2369      printf("title=%s\n", title);      printf("title=%s\n", title);
    2370      }      }
    2371    
    2372        for (j = 0, line = entry->lines; line; line = line->next) {
    2373     if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
    2374        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    2375     printf("mbmodule%d=", j);
    2376        else
    2377     printf("mbmodule%d=%s", j, prefix);
    2378    
    2379        for (i = 1; i < line->numElements; i++)
    2380     printf("%s%s", line->elements[i].item, line->elements[i].indent);
    2381        printf("\n");
    2382        j++;
    2383     }
    2384        }
    2385  }  }
    2386    
    2387  int isSuseSystem(void) {  int isSuseSystem(void) {
    # Line 2477  struct singleLine * addLineTmpl(struct s Line 2776  struct singleLine * addLineTmpl(struct s
    2776   insertElement(newLine, val, 1, cfi);   insertElement(newLine, val, 1, cfi);
    2777    
    2778   /* but try to keep the rootspec from the template... sigh */   /* but try to keep the rootspec from the template... sigh */
    2779   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)) {
    2780      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);      char * rootspec = getRootSpecifier(tmplLine->elements[1].item);
    2781      if (rootspec != NULL) {      if (rootspec != NULL) {
    2782   free(newLine->elements[1].item);   free(newLine->elements[1].item);
    # Line 2847  int updateActualImage(struct grubConfig Line 3146  int updateActualImage(struct grubConfig
    3146      firstElement = 2;      firstElement = 2;
    3147    
    3148   } else {   } else {
    3149      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);
    3150      if (!line) {      if (!line) {
    3151   /* no LT_KERNEL or LT_MBMODULE in this entry? */   /* no LT_KERNEL or LT_MBMODULE in this entry? */
    3152   continue;   continue;
    # Line 3003  int updateImage(struct grubConfig * cfg, Line 3302  int updateImage(struct grubConfig * cfg,
    3302      return rc;      return rc;
    3303  }  }
    3304    
    3305    int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
    3306     const char * image, const char * prefix, const char * initrd) {
    3307        struct singleEntry * entry;
    3308        struct singleLine * line, * kernelLine, *endLine = NULL;
    3309        int index = 0;
    3310    
    3311        if (!image) return 0;
    3312    
    3313        for (; (entry = findEntryByPath(cfg, newMBKernel, prefix, &index)); index++) {
    3314            kernelLine = getLineByType(LT_MBMODULE, entry->lines);
    3315            if (!kernelLine) continue;
    3316    
    3317            if (prefix) {
    3318                int prefixLen = strlen(prefix);
    3319                if (!strncmp(initrd, prefix, prefixLen))
    3320                    initrd += prefixLen;
    3321            }
    3322     endLine = getLineByType(LT_ENTRY_END, entry->lines);
    3323     if (endLine)
    3324        removeLine(entry, endLine);
    3325            line = addLine(entry, cfg->cfi, preferredLineType(LT_MBMODULE,cfg->cfi),
    3326     kernelLine->indent, initrd);
    3327            if (!line)
    3328        return 1;
    3329     if (endLine) {
    3330        line = addLine(entry, cfg->cfi, LT_ENTRY_END, "", NULL);
    3331                if (!line)
    3332     return 1;
    3333     }
    3334    
    3335            break;
    3336        }
    3337    
    3338        return 0;
    3339    }
    3340    
    3341  int updateInitrd(struct grubConfig * cfg, const char * image,  int updateInitrd(struct grubConfig * cfg, const char * image,
    3342                   const char * prefix, const char * initrd) {                   const char * prefix, const char * initrd) {
    3343      struct singleEntry * entry;      struct singleEntry * entry;
    # Line 3012  int updateInitrd(struct grubConfig * cfg Line 3347  int updateInitrd(struct grubConfig * cfg
    3347      if (!image) return 0;      if (!image) return 0;
    3348    
    3349      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
    3350          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI, entry->lines);          kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
    3351          if (!kernelLine) continue;          if (!kernelLine) continue;
    3352    
    3353          line = getLineByType(LT_INITRD|LT_INITRD_EFI, entry->lines);          line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
    3354          if (line)          if (line)
    3355              removeLine(entry, line);              removeLine(entry, line);
    3356          if (prefix) {          if (prefix) {
    # Line 3026  int updateInitrd(struct grubConfig * cfg Line 3361  int updateInitrd(struct grubConfig * cfg
    3361   endLine = getLineByType(LT_ENTRY_END, entry->lines);   endLine = getLineByType(LT_ENTRY_END, entry->lines);
    3362   if (endLine)   if (endLine)
    3363      removeLine(entry, endLine);      removeLine(entry, endLine);
    3364          line = addLine(entry, cfg->cfi, preferredLineType(LT_INITRD, cfg->cfi),   enum lineType_e lt;
    3365   kernelLine->indent, initrd);   switch(kernelLine->type) {
    3366        case LT_KERNEL:
    3367            lt = LT_INITRD;
    3368     break;
    3369        case LT_KERNEL_EFI:
    3370            lt = LT_INITRD_EFI;
    3371     break;
    3372        case LT_KERNEL_16:
    3373            lt = LT_INITRD_16;
    3374     break;
    3375        default:
    3376            lt = preferredLineType(LT_INITRD, cfg->cfi);
    3377     }
    3378            line = addLine(entry, cfg->cfi, lt, kernelLine->indent, initrd);
    3379          if (!line)          if (!line)
    3380      return 1;      return 1;
    3381   if (endLine) {   if (endLine) {
    # Line 3386  int addNewKernel(struct grubConfig * con Line 3734  int addNewKernel(struct grubConfig * con
    3734   const char * newKernelPath, const char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
    3735   const char * newKernelArgs, const char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
    3736   const char ** extraInitrds, int extraInitrdCount,   const char ** extraInitrds, int extraInitrdCount,
    3737                   const char * newMBKernel, const char * newMBKernelArgs) {                   const char * newMBKernel, const char * newMBKernelArgs,
    3738     const char * newDevTreePath) {
    3739      struct singleEntry * new;      struct singleEntry * new;
    3740      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
    3741      int needs;      int needs;
    # Line 3427  int addNewKernel(struct grubConfig * con Line 3776  int addNewKernel(struct grubConfig * con
    3776          needs |= NEED_MB;          needs |= NEED_MB;
    3777          new->multiboot = 1;          new->multiboot = 1;
    3778      }      }
    3779        if (newDevTreePath && getKeywordByType(LT_DEVTREE, config->cfi))
    3780     needs |= NEED_DEVTREE;
    3781    
    3782      if (template) {      if (template) {
    3783   for (masterLine = template->lines;   for (masterLine = template->lines;
    # Line 3612  int addNewKernel(struct grubConfig * con Line 3963  int addNewKernel(struct grubConfig * con
    3963   newLine = addLineTmpl(new, tmplLine, newLine, NULL,   newLine = addLineTmpl(new, tmplLine, newLine, NULL,
    3964   config->cfi);   config->cfi);
    3965      }      }
    3966        } else if (tmplLine->type == LT_DEVTREE &&
    3967           tmplLine->numElements == 2 && newDevTreePath) {
    3968            newLine = addLineTmpl(new, tmplLine, newLine,
    3969          newDevTreePath + strlen(prefix),
    3970          config->cfi);
    3971     needs &= ~NEED_DEVTREE;
    3972        } else if (tmplLine->type == LT_ENTRY_END && needs & NEED_DEVTREE) {
    3973     const char *ndtp = newDevTreePath;
    3974     if (!strncmp(newDevTreePath, prefix, strlen(prefix)))
    3975        ndtp += strlen(prefix);
    3976     newLine = addLine(new, config->cfi, LT_DEVTREE,
    3977      config->secondaryIndent,
    3978      ndtp);
    3979     needs &= ~NEED_DEVTREE;
    3980     newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
    3981      } else {      } else {
    3982   /* pass through other lines from the template */   /* pass through other lines from the template */
    3983   newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);   newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
    # Line 3625  int addNewKernel(struct grubConfig * con Line 3991  int addNewKernel(struct grubConfig * con
    3991   switch (config->cfi->entryStart) {   switch (config->cfi->entryStart) {
    3992      case LT_KERNEL:      case LT_KERNEL:
    3993      case LT_KERNEL_EFI:      case LT_KERNEL_EFI:
    3994        case LT_KERNEL_16:
    3995   if (new->multiboot && config->cfi->mbHyperFirst) {   if (new->multiboot && config->cfi->mbHyperFirst) {
    3996      /* fall through to LT_HYPER */      /* fall through to LT_HYPER */
    3997   } else {   } else {
    # Line 3686  int addNewKernel(struct grubConfig * con Line 4053  int addNewKernel(struct grubConfig * con
    4053   }   }
    4054      }      }
    4055    
    4056        struct singleLine *endLine = NULL;
    4057        endLine = getLineByType(LT_ENTRY_END, new->lines);
    4058        if (endLine) {
    4059        removeLine(new, endLine);
    4060        needs |= NEED_END;
    4061        }
    4062    
    4063      /* add the remainder of the lines, i.e. those that either      /* add the remainder of the lines, i.e. those that either
    4064       * 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,
    4065       * all the lines following the entryStart.       * all the lines following the entryStart.
    # Line 3731  int addNewKernel(struct grubConfig * con Line 4105  int addNewKernel(struct grubConfig * con
    4105   free(initrdVal);   free(initrdVal);
    4106   needs &= ~NEED_INITRD;   needs &= ~NEED_INITRD;
    4107      }      }
    4108        if (needs & NEED_DEVTREE) {
    4109     newLine = addLine(new, config->cfi, LT_DEVTREE,
    4110      config->secondaryIndent,
    4111      newDevTreePath);
    4112     needs &= ~NEED_DEVTREE;
    4113        }
    4114    
    4115        /* NEEDS_END must be last on bootloaders that need it... */
    4116      if (needs & NEED_END) {      if (needs & NEED_END) {
    4117   newLine = addLine(new, config->cfi, LT_ENTRY_END,   newLine = addLine(new, config->cfi, LT_ENTRY_END,
    4118   config->secondaryIndent, NULL);   config->secondaryIndent, NULL);
    # Line 3757  static void traceback(int signum) Line 4139  static void traceback(int signum)
    4139      memset(array, '\0', sizeof (array));      memset(array, '\0', sizeof (array));
    4140      size = backtrace(array, 40);      size = backtrace(array, 40);
    4141    
    4142      fprintf(stderr, "grubby recieved SIGSEGV!  Backtrace (%ld):\n",      fprintf(stderr, "grubby received SIGSEGV!  Backtrace (%ld):\n",
    4143              (unsigned long)size);              (unsigned long)size);
    4144      backtrace_symbols_fd(array, size, STDERR_FILENO);      backtrace_symbols_fd(array, size, STDERR_FILENO);
    4145      exit(1);      exit(1);
    # Line 3782  int main(int argc, const char ** argv) { Line 4164  int main(int argc, const char ** argv) {
    4164      char * newKernelArgs = NULL;      char * newKernelArgs = NULL;
    4165      char * newKernelInitrd = NULL;      char * newKernelInitrd = NULL;
    4166      char * newKernelTitle = NULL;      char * newKernelTitle = NULL;
    4167      char * newKernelVersion = NULL;      char * newDevTreePath = NULL;
    4168      char * newMBKernel = NULL;      char * newMBKernel = NULL;
    4169      char * newMBKernelArgs = NULL;      char * newMBKernelArgs = NULL;
    4170      char * removeMBKernelArgs = NULL;      char * removeMBKernelArgs = NULL;
    # Line 3792  int main(int argc, const char ** argv) { Line 4174  int main(int argc, const char ** argv) {
    4174      char * removeArgs = NULL;      char * removeArgs = NULL;
    4175      char * kernelInfo = NULL;      char * kernelInfo = NULL;
    4176      char * extraInitrds[MAX_EXTRA_INITRDS] = { NULL };      char * extraInitrds[MAX_EXTRA_INITRDS] = { NULL };
    4177        char * envPath = NULL;
    4178      const char * chptr = NULL;      const char * chptr = NULL;
    4179      struct configFileInfo * cfi = NULL;      struct configFileInfo * cfi = NULL;
    4180      struct grubConfig * config;      struct grubConfig * config;
    # Line 3839  int main(int argc, const char ** argv) { Line 4222  int main(int argc, const char ** argv) {
    4222      _("display the index of the default kernel") },      _("display the index of the default kernel") },
    4223   { "default-title", 0, 0, &displayDefaultTitle, 0,   { "default-title", 0, 0, &displayDefaultTitle, 0,
    4224      _("display the title of the default kernel") },      _("display the title of the default kernel") },
    4225     { "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0,
    4226        _("device tree file for new stanza"), _("dtb-path") },
    4227   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
    4228      _("configure elilo bootloader") },      _("configure elilo bootloader") },
    4229   { "efi", 0, POPT_ARG_NONE, &isEfi, 0,   { "efi", 0, POPT_ARG_NONE, &isEfi, 0,
    4230      _("force grub2 stanzas to use efi") },      _("force grub2 stanzas to use efi") },
    4231     { "env", 0, POPT_ARG_STRING, &envPath, 0,
    4232        _("path for environment data"),
    4233        _("path") },
    4234   { "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,   { "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,
    4235      _("configure extlinux bootloader (from syslinux)") },      _("configure extlinux bootloader (from syslinux)") },
    4236   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,
    # Line 3855  int main(int argc, const char ** argv) { Line 4243  int main(int argc, const char ** argv) {
    4243   { "initrd", 0, POPT_ARG_STRING, &newKernelInitrd, 0,   { "initrd", 0, POPT_ARG_STRING, &newKernelInitrd, 0,
    4244      _("initrd image for the new kernel"), _("initrd-path") },      _("initrd image for the new kernel"), _("initrd-path") },
    4245   { "extra-initrd", 'i', POPT_ARG_STRING, NULL, 'i',   { "extra-initrd", 'i', POPT_ARG_STRING, NULL, 'i',
    4246      _("auxilliary initrd image for things other than the new kernel"), _("initrd-path") },      _("auxiliary initrd image for things other than the new kernel"), _("initrd-path") },
    4247   { "lilo", 0, POPT_ARG_NONE, &configureLilo, 0,   { "lilo", 0, POPT_ARG_NONE, &configureLilo, 0,
    4248      _("configure lilo bootloader") },      _("configure lilo bootloader") },
    4249   { "make-default", 0, 0, &makeDefault, 0,   { "make-default", 0, 0, &makeDefault, 0,
    # Line 3899  int main(int argc, const char ** argv) { Line 4287  int main(int argc, const char ** argv) {
    4287    
    4288      signal(SIGSEGV, traceback);      signal(SIGSEGV, traceback);
    4289    
    4290        int i = 0;
    4291        for (int j = 1; j < argc; j++)
    4292     i += strlen(argv[j]) + 1;
    4293        saved_command_line = malloc(i);
    4294        if (!saved_command_line) {
    4295     fprintf(stderr, "grubby: %m\n");
    4296     exit(1);
    4297        }
    4298        saved_command_line[0] = '\0';
    4299        for (int j = 1; j < argc; j++) {
    4300     strcat(saved_command_line, argv[j]);
    4301     strncat(saved_command_line, j == argc -1 ? "" : " ", 1);
    4302        }
    4303    
    4304      optCon = poptGetContext("grubby", argc, argv, options, 0);      optCon = poptGetContext("grubby", argc, argv, options, 0);
    4305      poptReadDefaultConfig(optCon, 1);      poptReadDefaultConfig(optCon, 1);
    4306    
    # Line 3942  int main(int argc, const char ** argv) { Line 4344  int main(int argc, const char ** argv) {
    4344   return 1;   return 1;
    4345      } else if (configureGrub2) {      } else if (configureGrub2) {
    4346   cfi = &grub2ConfigType;   cfi = &grub2ConfigType;
    4347     if (envPath)
    4348        cfi->envFile = envPath;
    4349      } else if (configureLilo) {      } else if (configureLilo) {
    4350   cfi = &liloConfigType;   cfi = &liloConfigType;
    4351      } else if (configureGrub) {      } else if (configureGrub) {
    # Line 3985  int main(int argc, const char ** argv) { Line 4389  int main(int argc, const char ** argv) {
    4389      grubConfig = cfi->defaultConfig;      grubConfig = cfi->defaultConfig;
    4390      }      }
    4391    
    4392      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo ||
    4393      newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
    4394      defaultKernel || displayDefaultIndex || displayDefaultTitle ||      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
    4395      (defaultIndex >= 0))) {      (defaultIndex >= 0))) {
    # Line 3994  int main(int argc, const char ** argv) { Line 4398  int main(int argc, const char ** argv) {
    4398   return 1;   return 1;
    4399      }      }
    4400    
    4401      if ((displayDefault || kernelInfo) && (newKernelVersion || newKernelPath ||      if ((displayDefault || kernelInfo) && (newKernelPath ||
    4402     removeKernelPath)) {     removeKernelPath)) {
    4403   fprintf(stderr, _("grubby: --default-kernel and --info may not "   fprintf(stderr, _("grubby: --default-kernel and --info may not "
    4404    "be used when adding or removing kernels\n"));    "be used when adding or removing kernels\n"));
    # Line 4142  int main(int argc, const char ** argv) { Line 4546  int main(int argc, const char ** argv) {
    4546   return 0;   return 0;
    4547      }      }
    4548    
    4549        if (grubConfig == NULL) {
    4550     printf("Could not find bootloader configuration file.\n");
    4551     exit(1);
    4552        }
    4553    
    4554      config = readConfig(grubConfig, cfi);      config = readConfig(grubConfig, cfi);
    4555      if (!config) return 1;      if (!config) return 1;
    4556    
    # Line 4151  int main(int argc, const char ** argv) { Line 4560  int main(int argc, const char ** argv) {
    4560          char * rootspec;          char * rootspec;
    4561    
    4562   if (config->defaultImage == -1) return 0;   if (config->defaultImage == -1) return 0;
    4563     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
    4564     cfi->defaultIsSaved)
    4565        config->defaultImage = 0;
    4566   entry = findEntryByIndex(config, config->defaultImage);   entry = findEntryByIndex(config, config->defaultImage);
    4567   if (!entry) return 0;   if (!entry) return 0;
    4568   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
    4569    
    4570   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);
    4571   if (!line) return 0;   if (!line) return 0;
    4572    
    4573          rootspec = getRootSpecifier(line->elements[1].item);          rootspec = getRootSpecifier(line->elements[1].item);
    # Line 4169  int main(int argc, const char ** argv) { Line 4581  int main(int argc, const char ** argv) {
    4581   struct singleEntry * entry;   struct singleEntry * entry;
    4582    
    4583   if (config->defaultImage == -1) return 0;   if (config->defaultImage == -1) return 0;
    4584     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
    4585     cfi->defaultIsSaved)
    4586        config->defaultImage = 0;
    4587   entry = findEntryByIndex(config, config->defaultImage);   entry = findEntryByIndex(config, config->defaultImage);
    4588   if (!entry) return 0;   if (!entry) return 0;
    4589    
    # Line 4191  int main(int argc, const char ** argv) { Line 4606  int main(int argc, const char ** argv) {
    4606    
    4607      } else if (displayDefaultIndex) {      } else if (displayDefaultIndex) {
    4608          if (config->defaultImage == -1) return 0;          if (config->defaultImage == -1) return 0;
    4609     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
    4610     cfi->defaultIsSaved)
    4611        config->defaultImage = 0;
    4612          printf("%i\n", config->defaultImage);          printf("%i\n", config->defaultImage);
    4613            return 0;
    4614    
    4615      } else if (kernelInfo)      } else if (kernelInfo)
    4616   return displayInfo(config, kernelInfo, bootPrefix);   return displayInfo(config, kernelInfo, bootPrefix);
    # Line 4209  int main(int argc, const char ** argv) { Line 4628  int main(int argc, const char ** argv) {
    4628      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
    4629                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
    4630      if (updateKernelPath && newKernelInitrd) {      if (updateKernelPath && newKernelInitrd) {
    4631              if (updateInitrd(config, updateKernelPath, bootPrefix,      if (newMBKernel) {
    4632                               newKernelInitrd)) return 1;      if (addMBInitrd(config, newMBKernel, updateKernelPath,
    4633     bootPrefix, newKernelInitrd))
    4634        return 1;
    4635        } else {
    4636        if (updateInitrd(config, updateKernelPath, bootPrefix,
    4637     newKernelInitrd))
    4638     return 1;
    4639        }
    4640      }      }
    4641      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
    4642                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
    4643                       (const char **)extraInitrds, extraInitrdCount,                       (const char **)extraInitrds, extraInitrdCount,
    4644                       newMBKernel, newMBKernelArgs)) return 1;                       newMBKernel, newMBKernelArgs, newDevTreePath)) return 1;
    4645            
    4646    
    4647      if (numEntries(config) == 0) {      if (numEntries(config) == 0) {
    Legend:
    Removed from v.2056  
    changed lines
      Added in v.2709