Magellan Linux

Diff of /trunk/grubby/grubby.c

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

trunk/mkinitrd-magellan/grubby/grubby.c revision 532 by niro, Sat Sep 1 22:45:15 2007 UTC trunk/grubby/grubby.c revision 2959 by niro, Wed Jun 29 14:07:33 2016 UTC
# Line 1  Line 1 
1  /* Copyright (C) 2001-2005 Red Hat, Inc.  /*
2     * grubby.c
3     This program is free software; you can redistribute it and/or   *
4     modify it under the terms of the General Public License as published   * Copyright (C) 2001-2008 Red Hat, Inc.
5     by the Free Software Foundation; either version 2 of the License, or   * All rights reserved.
6     (at your option) any later version.   *
7     * This program is free software; you can redistribute it and/or modify
8     This program is distributed in the hope that it will be useful,   * it under the terms of the GNU General Public License as published by
9     but WITHOUT ANY WARRANTY; without even the implied warranty of   * the Free Software Foundation; either version 2 of the License, or
10     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU   * (at your option) any later version.
11     General Public License for more details.   *
12     * This program is distributed in the hope that it will be useful,
13     You should have received a copy of the GNU General Public   * but WITHOUT ANY WARRANTY; without even the implied warranty of
14     License along with this program; if not, write to the Free   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA   * GNU General Public License for more details.
16     02111-1307 USA.  */   *
17     * You should have received a copy of the GNU General Public License
18     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19     */
20    
21    #ifndef _GNU_SOURCE
22    #define _GNU_SOURCE
23    #endif
24  #include <ctype.h>  #include <ctype.h>
25  #include <errno.h>  #include <errno.h>
26  #include <fcntl.h>  #include <fcntl.h>
# Line 25  Line 31 
31  #include <string.h>  #include <string.h>
32  #include <sys/stat.h>  #include <sys/stat.h>
33  #include <unistd.h>  #include <unistd.h>
34    #include <libgen.h>
35    #include <execinfo.h>
36    #include <signal.h>
37    #include <blkid/blkid.h>
38    
39    #include "log.h"
40    
41    #ifndef DEBUG
42    #define DEBUG 0
43    #endif
44    
45    #if DEBUG
46    #define dbgPrintf(format, args...) fprintf(stderr, format , ## args)
47    #else
48    #define dbgPrintf(format, args...)
49    #endif
50    
51  #include "mount_by_label.h"  int debug = 0; /* Currently just for template debugging */
52    
53  #define _(A) (A)  #define _(A) (A)
54    
55    #define MAX_EXTRA_INITRDS  16 /* code segment checked by --bootloader-probe */
56  #define CODE_SEG_SIZE  128 /* code segment checked by --bootloader-probe */  #define CODE_SEG_SIZE  128 /* code segment checked by --bootloader-probe */
57    
58    #define NOOP_OPCODE 0x90
59    #define JMP_SHORT_OPCODE 0xeb
60    
61    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;
74      char * indent;      char * indent;
75  };  };
76    
77  enum lineType_e { LT_WHITESPACE, LT_TITLE, LT_KERNEL, LT_INITRD, LT_DEFAULT,  enum lineType_e {
78         LT_UNKNOWN, LT_ROOT, LT_FALLBACK, LT_KERNELARGS, LT_BOOT,      LT_WHITESPACE   = 1 << 0,
79         LT_BOOTROOT, LT_LBA, LT_MBMODULE, LT_OTHER, LT_GENERIC };      LT_TITLE        = 1 << 1,
80        LT_KERNEL       = 1 << 2,
81        LT_INITRD       = 1 << 3,
82        LT_HYPER        = 1 << 4,
83        LT_DEFAULT      = 1 << 5,
84        LT_MBMODULE     = 1 << 6,
85        LT_ROOT         = 1 << 7,
86        LT_FALLBACK     = 1 << 8,
87        LT_KERNELARGS   = 1 << 9,
88        LT_BOOT         = 1 << 10,
89        LT_BOOTROOT     = 1 << 11,
90        LT_LBA          = 1 << 12,
91        LT_OTHER        = 1 << 13,
92        LT_GENERIC      = 1 << 14,
93        LT_ECHO    = 1 << 16,
94        LT_MENUENTRY    = 1 << 17,
95        LT_ENTRY_END    = 1 << 18,
96        LT_SET_VARIABLE = 1 << 19,
97        LT_KERNEL_EFI   = 1 << 20,
98        LT_INITRD_EFI   = 1 << 21,
99        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 {
106      char * indent;      char * indent;
# Line 61  struct singleEntry { Line 121  struct singleEntry {
121    
122  #define GRUB_CONFIG_NO_DEFAULT    (1 << 0) /* don't write out default=0 */  #define GRUB_CONFIG_NO_DEFAULT    (1 << 0) /* don't write out default=0 */
123    
124  #define KERNEL_KERNEL    (1 << 0)  /* These defines are (only) used in addNewKernel() */
125  #define KERNEL_INITRD    (1 << 2)  #define NEED_KERNEL  (1 << 0)
126  #define KERNEL_TITLE    (1 << 3)  #define NEED_INITRD  (1 << 1)
127  #define KERNEL_ARGS    (1 << 4)  #define NEED_TITLE   (1 << 2)
128  #define KERNEL_MB           (1 << 5)  #define NEED_ARGS    (1 << 3)
129    #define NEED_MB      (1 << 4)
130    #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
135    #define DEFAULT_SAVED_GRUB2 -3
136    
137  struct keywordTypes {  struct keywordTypes {
138      char * key;      char * key;
139      enum lineType_e type;      enum lineType_e type;
140      char nextChar;      char nextChar;
141  } ;      char separatorChar;
142    };
143    
144    struct configFileInfo;
145    
146    typedef const char *(*findConfigFunc)(struct configFileInfo *);
147    typedef const int (*writeLineFunc)(struct configFileInfo *,
148     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;
155        writeLineFunc writeLine;
156        getEnvFunc getEnv;
157        setEnvFunc setEnv;
158      struct keywordTypes * keywords;      struct keywordTypes * keywords;
159        int caseInsensitive;
160      int defaultIsIndex;      int defaultIsIndex;
161        int defaultIsVariable;
162      int defaultSupportSaved;      int defaultSupportSaved;
163      enum lineType_e entrySeparator;      int defaultIsSaved;
164        int defaultIsUnquoted;
165        enum lineType_e entryStart;
166        enum lineType_e entryEnd;
167      int needsBootPrefix;      int needsBootPrefix;
168      int argsInQuotes;      int argsInQuotes;
169      int maxTitleLength;      int maxTitleLength;
170      int titleBracketed;      int titleBracketed;
171        int titlePosition;
172        int mbHyperFirst;
173        int mbInitRdIsModule;
174        int mbConcatArgs;
175        int mbAllowExtraInitRds;
176        char *envFile;
177  };  };
178    
179  struct keywordTypes grubKeywords[] = {  struct keywordTypes grubKeywords[] = {
# Line 94  struct keywordTypes grubKeywords[] = { Line 182  struct keywordTypes grubKeywords[] = {
182      { "default",    LT_DEFAULT,    ' ' },      { "default",    LT_DEFAULT,    ' ' },
183      { "fallback",   LT_FALLBACK,    ' ' },      { "fallback",   LT_FALLBACK,    ' ' },
184      { "kernel",    LT_KERNEL,    ' ' },      { "kernel",    LT_KERNEL,    ' ' },
185      { "initrd",    LT_INITRD,    ' ' },      { "initrd",    LT_INITRD,    ' ', ' ' },
186      { "module",     LT_MBMODULE,    ' ' },      { "module",     LT_MBMODULE,    ' ' },
187        { "kernel",     LT_HYPER,       ' ' },
188      { NULL,    0, 0 },      { NULL,    0, 0 },
189  };  };
190    
191    const char *grubFindConfig(struct configFileInfo *cfi) {
192        static const char *configFiles[] = {
193     "/boot/grub/grub.conf",
194     "/boot/grub/menu.lst",
195     "/etc/grub.conf",
196     "/boot/grub2/grub.cfg",
197     "/boot/grub2-efi/grub.cfg",
198     NULL
199        };
200        static int i = -1;
201    
202        if (i == -1) {
203     for (i = 0; configFiles[i] != NULL; i++) {
204        dbgPrintf("Checking \"%s\": ", configFiles[i]);
205        if (!access(configFiles[i], R_OK)) {
206     dbgPrintf("found\n");
207     return configFiles[i];
208        }
209        dbgPrintf("not found\n");
210     }
211        }
212        return configFiles[i];
213    }
214    
215  struct configFileInfo grubConfigType = {  struct configFileInfo grubConfigType = {
216      "/boot/grub/grub.conf",    /* defaultConfig */      .findConfig = grubFindConfig,
217      grubKeywords,    /* keywords */      .keywords = grubKeywords,
218      1,    /* defaultIsIndex */      .defaultIsIndex = 1,
219      1,    /* defaultSupportSaved */      .defaultSupportSaved = 1,
220      LT_TITLE,    /* entrySeparator */      .entryStart = LT_TITLE,
221      1,    /* needsBootPrefix */      .needsBootPrefix = 1,
222      0,    /* argsInQuotes */      .mbHyperFirst = 1,
223      0,    /* maxTitleLength */      .mbInitRdIsModule = 1,
224      0,                                      /* titleBracketed */      .mbAllowExtraInitRds = 1,
225    };
226    
227    struct keywordTypes grub2Keywords[] = {
228        { "menuentry",  LT_MENUENTRY,   ' ' },
229        { "}",          LT_ENTRY_END,   ' ' },
230        { "echo",       LT_ECHO,        ' ' },
231        { "set",        LT_SET_VARIABLE,' ', '=' },
232        { "root",       LT_BOOTROOT,    ' ' },
233        { "default",    LT_DEFAULT,     ' ' },
234        { "fallback",   LT_FALLBACK,    ' ' },
235        { "linux",      LT_KERNEL,      ' ' },
236        { "linuxefi",   LT_KERNEL_EFI,  ' ' },
237        { "linux16",    LT_KERNEL_16,   ' ' },
238        { "initrd",     LT_INITRD,      ' ', ' ' },
239        { "initrdefi",  LT_INITRD_EFI,  ' ', ' ' },
240        { "initrd16",   LT_INITRD_16,   ' ', ' ' },
241        { "module",     LT_MBMODULE,    ' ' },
242        { "kernel",     LT_HYPER,       ' ' },
243        { "devicetree", LT_DEVTREE,  ' ' },
244        { NULL, 0, 0 },
245    };
246    
247    const char *grub2FindConfig(struct configFileInfo *cfi) {
248        static const char *configFiles[] = {
249     "/boot/grub/grub-efi.cfg",
250     "/boot/grub/grub.cfg",
251     NULL
252        };
253        static int i = -1;
254        static const char *grub_cfg = "/boot/grub/grub.cfg";
255        int rc = -1;
256    
257        if (i == -1) {
258     for (i = 0; configFiles[i] != NULL; i++) {
259        dbgPrintf("Checking \"%s\": ", configFiles[i]);
260        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");
269     return configFiles[i];
270        }
271     }
272        }
273    
274        /* Ubuntu renames grub2 to grub, so check for the grub.d directory
275         * that isn't in grub1, and if it exists, return the config file path
276         * that they use. */
277        if (configFiles[i] == NULL && !access("/etc/grub.d/", R_OK)) {
278     dbgPrintf("found\n");
279     return grub_cfg;
280        }
281    
282        dbgPrintf("not found\n");
283        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) {
386      int count = 0;
387    
388      for (int i = 0; i < line->numElements; i++) {
389        int indentSize = 0;
390    
391        count = count + strlen(line->elements[i].item);
392    
393        indentSize = strlen(line->elements[i].indent);
394        if (indentSize > 0)
395          count = count + indentSize;
396        else
397          /* be extra safe and add room for whitespaces */
398          count = count + 1;
399      }
400    
401      /* room for trailing terminator */
402      count = count + 1;
403    
404      return count;
405    }
406    
407    static int isquote(char q)
408    {
409        if (q == '\'' || q == '\"')
410     return 1;
411        return 0;
412    }
413    
414    static int iskernel(enum lineType_e type) {
415        return (type == LT_KERNEL || type == LT_KERNEL_EFI || type == LT_KERNEL_16);
416    }
417    
418    static int isinitrd(enum lineType_e type) {
419        return (type == LT_INITRD || type == LT_INITRD_EFI || type == LT_INITRD_16);
420    }
421    
422    char *grub2ExtractTitle(struct singleLine * line) {
423        char * current;
424        char * current_indent;
425        int current_len;
426        int current_indent_len;
427        int i;
428    
429        /* bail out if line does not start with menuentry */
430        if (strcmp(line->elements[0].item, "menuentry"))
431          return NULL;
432    
433        i = 1;
434        current = line->elements[i].item;
435        current_len = strlen(current);
436    
437        /* if second word is quoted, strip the quotes and return single word */
438        if (isquote(*current) && isquote(current[current_len - 1])) {
439     char *tmp;
440    
441     tmp = strdup(current);
442     *(tmp + current_len - 1) = '\0';
443     return ++tmp;
444        }
445    
446        /* if no quotes, return second word verbatim */
447        if (!isquote(*current))
448     return current;
449    
450        /* second element start with a quote, so we have to find the element
451         * whose last character is also quote (assuming it's the closing one) */
452        int resultMaxSize;
453        char * result;
454        
455        resultMaxSize = sizeOfSingleLine(line);
456        result = malloc(resultMaxSize);
457        snprintf(result, resultMaxSize, "%s", ++current);
458        
459        i++;
460        for (; i < line->numElements; ++i) {
461     current = line->elements[i].item;
462     current_len = strlen(current);
463     current_indent = line->elements[i].indent;
464     current_indent_len = strlen(current_indent);
465    
466     strncat(result, current_indent, current_indent_len);
467     if (!isquote(current[current_len-1])) {
468        strncat(result, current, current_len);
469     } else {
470        strncat(result, current, current_len - 1);
471        break;
472     }
473        }
474        return result;
475    }
476    
477    struct configFileInfo grub2ConfigType = {
478        .findConfig = grub2FindConfig,
479        .getEnv = grub2GetEnv,
480        .setEnv = grub2SetEnv,
481        .keywords = grub2Keywords,
482        .defaultIsIndex = 1,
483        .defaultSupportSaved = 1,
484        .defaultIsVariable = 1,
485        .entryStart = LT_MENUENTRY,
486        .entryEnd = LT_ENTRY_END,
487        .titlePosition = 1,
488        .needsBootPrefix = 1,
489        .mbHyperFirst = 1,
490        .mbInitRdIsModule = 1,
491        .mbAllowExtraInitRds = 1,
492  };  };
493    
494  struct keywordTypes yabootKeywords[] = {  struct keywordTypes yabootKeywords[] = {
# Line 142  struct keywordTypes yabootKeywords[] = { Line 522  struct keywordTypes yabootKeywords[] = {
522      { "partition",  LT_GENERIC,    '=' },      { "partition",  LT_GENERIC,    '=' },
523      { "device",    LT_GENERIC,    '=' },      { "device",    LT_GENERIC,    '=' },
524      { "fstype",    LT_GENERIC,    '=' },      { "fstype",    LT_GENERIC,    '=' },
525      { "initrd",    LT_INITRD,    '=' },      { "initrd",    LT_INITRD,    '=', ';' },
526      { "append",    LT_KERNELARGS,  '=' },      { "append",    LT_KERNELARGS,  '=' },
527      { "boot",    LT_BOOT,    '=' },      { "boot",    LT_BOOT,    '=' },
528      { "lba",    LT_LBA,    ' ' },      { "lba",    LT_LBA,    ' ' },
# Line 162  struct keywordTypes liloKeywords[] = { Line 542  struct keywordTypes liloKeywords[] = {
542      { NULL,    0, 0 },      { NULL,    0, 0 },
543  };  };
544    
545    struct keywordTypes eliloKeywords[] = {
546        { "label",    LT_TITLE,    '=' },
547        { "root",    LT_ROOT,    '=' },
548        { "default",    LT_DEFAULT,    '=' },
549        { "image",    LT_KERNEL,    '=' },
550        { "initrd",    LT_INITRD,    '=' },
551        { "append",    LT_KERNELARGS,  '=' },
552        { "vmm",    LT_HYPER,       '=' },
553        { NULL,    0, 0 },
554    };
555    
556  struct keywordTypes siloKeywords[] = {  struct keywordTypes siloKeywords[] = {
557      { "label",    LT_TITLE,    '=' },      { "label",    LT_TITLE,    '=' },
558      { "root",    LT_ROOT,    '=' },      { "root",    LT_ROOT,    '=' },
# Line 183  struct keywordTypes ziplKeywords[] = { Line 574  struct keywordTypes ziplKeywords[] = {
574      { NULL,         0, 0 },      { NULL,         0, 0 },
575  };  };
576    
577    struct keywordTypes extlinuxKeywords[] = {
578        { "label",    LT_TITLE,    ' ' },
579        { "root",    LT_ROOT,    ' ' },
580        { "default",    LT_DEFAULT,    ' ' },
581        { "kernel",    LT_KERNEL,    ' ' },
582        { "initrd",    LT_INITRD,      ' ', ',' },
583        { "append",    LT_KERNELARGS,  ' ' },
584        { "prompt",     LT_UNKNOWN,     ' ' },
585        { NULL,    0, 0 },
586    };
587    int useextlinuxmenu;
588  struct configFileInfo eliloConfigType = {  struct configFileInfo eliloConfigType = {
589      "/boot/efi/EFI/redhat/elilo.conf",    /* defaultConfig */      .defaultConfig = "/boot/efi/EFI/redhat/elilo.conf",
590      liloKeywords,    /* keywords */      .keywords = eliloKeywords,
591      0,    /* defaultIsIndex */      .entryStart = LT_KERNEL,
592      0,    /* defaultSupportSaved */      .needsBootPrefix = 1,
593      LT_KERNEL,    /* entrySeparator */      .argsInQuotes = 1,
594      1,                    /* needsBootPrefix */      .mbConcatArgs = 1,
     1,    /* argsInQuotes */  
     0,    /* maxTitleLength */  
     0,                                      /* titleBracketed */  
595  };  };
596    
597  struct configFileInfo liloConfigType = {  struct configFileInfo liloConfigType = {
598      "/etc/lilo.conf",    /* defaultConfig */      .defaultConfig = "/etc/lilo.conf",
599      liloKeywords,    /* keywords */      .keywords = liloKeywords,
600      0,    /* defaultIsIndex */      .entryStart = LT_KERNEL,
601      0,    /* defaultSupportSaved */      .argsInQuotes = 1,
602      LT_KERNEL,    /* entrySeparator */      .maxTitleLength = 15,
     0,    /* needsBootPrefix */  
     1,    /* argsInQuotes */  
     15,    /* maxTitleLength */  
     0,                                      /* titleBracketed */  
603  };  };
604    
605  struct configFileInfo yabootConfigType = {  struct configFileInfo yabootConfigType = {
606      "/etc/yaboot.conf",    /* defaultConfig */      .defaultConfig = "/etc/yaboot.conf",
607      yabootKeywords,    /* keywords */      .keywords = yabootKeywords,
608      0,    /* defaultIsIndex */      .entryStart = LT_KERNEL,
609      0,    /* defaultSupportSaved */      .needsBootPrefix = 1,
610      LT_KERNEL,    /* entrySeparator */      .argsInQuotes = 1,
611      1,    /* needsBootPrefix */      .maxTitleLength = 15,
612      1,    /* argsInQuotes */      .mbAllowExtraInitRds = 1,
     15,    /* maxTitleLength */  
     0,                                      /* titleBracketed */  
613  };  };
614    
615  struct configFileInfo siloConfigType = {  struct configFileInfo siloConfigType = {
616      "/etc/silo.conf",    /* defaultConfig */      .defaultConfig = "/etc/silo.conf",
617      siloKeywords,    /* keywords */      .keywords = siloKeywords,
618      0,    /* defaultIsIndex */      .entryStart = LT_KERNEL,
619      0,    /* defaultSupportSaved */      .needsBootPrefix = 1,
620      LT_KERNEL,    /* entrySeparator */      .argsInQuotes = 1,
621      1,    /* needsBootPrefix */      .maxTitleLength = 15,
     1,    /* argsInQuotes */  
     15,    /* maxTitleLength */  
     0,                                      /* titleBracketed */  
622  };  };
623    
624  struct configFileInfo ziplConfigType = {  struct configFileInfo ziplConfigType = {
625      "/etc/zipl.conf",    /* defaultConfig */      .defaultConfig = "/etc/zipl.conf",
626      ziplKeywords,    /* keywords */      .keywords = ziplKeywords,
627      0,    /* defaultIsIndex */      .entryStart = LT_TITLE,
628      0,    /* defaultSupportSaved */      .argsInQuotes = 1,
629      LT_TITLE,    /* entrySeparator */      .titleBracketed = 1,
630      0,    /* needsBootPrefix */  };
631      1,    /* argsInQuotes */  
632      15,    /* maxTitleLength */  struct configFileInfo extlinuxConfigType = {
633      1,                                      /* titleBracketed */      .defaultConfig = "/boot/extlinux/extlinux.conf",
634        .keywords = extlinuxKeywords,
635        .caseInsensitive = 1,
636        .entryStart = LT_TITLE,
637        .needsBootPrefix = 1,
638        .maxTitleLength = 255,
639        .mbAllowExtraInitRds = 1,
640        .defaultIsUnquoted = 1,
641  };  };
642    
643  struct grubConfig {  struct grubConfig {
# Line 255  struct grubConfig { Line 652  struct grubConfig {
652      struct configFileInfo * cfi;      struct configFileInfo * cfi;
653  };  };
654    
655    blkid_cache blkid;
656    
657  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index);  struct singleEntry * findEntryByIndex(struct grubConfig * cfg, int index);
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  static char * strndup(char * from, int len);  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);
666  static void lineFree(struct singleLine * line);  static void lineFree(struct singleLine * line);
667  static int lineWrite(FILE * out, struct singleLine * line,  static int lineWrite(FILE * out, struct singleLine * line,
668       struct configFileInfo * cfi);       struct configFileInfo * cfi);
669  static int getNextLine(char ** bufPtr, struct singleLine * line,  static int getNextLine(char ** bufPtr, struct singleLine * line,
670         struct configFileInfo * cfi);         struct configFileInfo * cfi);
671  static char * getRootSpecifier(char * str);  static char * getRootSpecifier(char * str);
672    static void requote(struct singleLine *line, struct configFileInfo * cfi);
673  static char * strndup(char * from, int len) {  static void insertElement(struct singleLine * line,
674      char * to;    const char * item, int insertHere,
675      struct configFileInfo * cfi);
676      to = malloc(len + 1);  static void removeElement(struct singleLine * line, int removeHere);
677      strncpy(to, from, len);  static struct keywordTypes * getKeywordByType(enum lineType_e type,
678      to[len] = '\0';        struct configFileInfo * cfi);
679    static enum lineType_e getTypeByKeyword(char * keyword,
680      return to;   struct configFileInfo * cfi);
681  }  static struct singleLine * getLineByType(enum lineType_e type,
682     struct singleLine * line);
683    static int checkForExtLinux(struct grubConfig * config);
684    struct singleLine * addLineTmpl(struct singleEntry * entry,
685                                    struct singleLine * tmplLine,
686                                    struct singleLine * prevLine,
687                                    const char * val,
688     struct configFileInfo * cfi);
689    struct singleLine *  addLine(struct singleEntry * entry,
690                                 struct configFileInfo * cfi,
691                                 enum lineType_e type, char * defaultIndent,
692                                 const char * val);
693    
694  static char * sdupprintf(const char *format, ...)  static char * sdupprintf(const char *format, ...)
695  #ifdef __GNUC__  #ifdef __GNUC__
# Line 313  static char * sdupprintf(const char *for Line 724  static char * sdupprintf(const char *for
724      return buf;      return buf;
725  }  }
726    
727    static enum lineType_e preferredLineType(enum lineType_e type,
728     struct configFileInfo *cfi) {
729        if (isEfi && cfi == &grub2ConfigType) {
730     switch (type) {
731     case LT_KERNEL:
732        return isEfiOnly ? LT_KERNEL : LT_KERNEL_EFI;
733     case LT_INITRD:
734        return isEfiOnly ? LT_INITRD : LT_INITRD_EFI;
735     default:
736        return type;
737     }
738    #if defined(__i386__) || defined(__x86_64__)
739        } else if (cfi == &grub2ConfigType) {
740     switch (type) {
741     case LT_KERNEL:
742        return LT_KERNEL_16;
743     case LT_INITRD:
744        return LT_INITRD_16;
745     default:
746        return type;
747     }
748    #endif
749        }
750        return type;
751    }
752    
753    static struct keywordTypes * getKeywordByType(enum lineType_e type,
754          struct configFileInfo * cfi) {
755        for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
756     if (kw->type == type)
757        return kw;
758        }
759        return NULL;
760    }
761    
762    static char *getKeyByType(enum lineType_e type, struct configFileInfo * cfi) {
763        struct keywordTypes *kt = getKeywordByType(type, cfi);
764        if (kt)
765     return kt->key;
766        return "unknown";
767    }
768    
769    static char * getpathbyspec(char *device) {
770        if (!blkid)
771            blkid_get_cache(&blkid, NULL);
772    
773        return blkid_get_devname(blkid, device, NULL);
774    }
775    
776    static char * getuuidbydev(char *device) {
777        if (!blkid)
778     blkid_get_cache(&blkid, NULL);
779    
780        return blkid_get_tag_value(blkid, "UUID", device);
781    }
782    
783    static enum lineType_e getTypeByKeyword(char * keyword,
784     struct configFileInfo * cfi) {
785        for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
786     if (cfi->caseInsensitive) {
787        if (!strcasecmp(keyword, kw->key))
788                    return kw->type;
789     } else {
790        if (!strcmp(keyword, kw->key))
791            return kw->type;
792     }
793        }
794        return LT_UNKNOWN;
795    }
796    
797    static struct singleLine * getLineByType(enum lineType_e type,
798     struct singleLine * line) {
799        dbgPrintf("getLineByType(%d): ", type);
800        for (; line; line = line->next) {
801     dbgPrintf("%d:%s ", line->type,
802      line->numElements ? line->elements[0].item : "(empty)");
803     if (line->type & type) break;
804        }
805        dbgPrintf(line ? "\n" : " (failed)\n");
806        return line;
807    }
808    
809  static int isBracketedTitle(struct singleLine * line) {  static int isBracketedTitle(struct singleLine * line) {
810      if ((*line->elements[0].item == '[') && (line->numElements == 1)) {      if (line->numElements == 1 && *line->elements[0].item == '[') {
811          int len = strlen(line->elements[0].item);          int len = strlen(line->elements[0].item);
812          if (*(line->elements[0].item + len - 1) == ']') {          if (*(line->elements[0].item + len - 1) == ']') {
813              /* FIXME: this is a hack... */              /* FIXME: this is a hack... */
# Line 326  static int isBracketedTitle(struct singl Line 819  static int isBracketedTitle(struct singl
819      return 0;      return 0;
820  }  }
821    
822  /* figure out if this is a entry separator */  static int isEntryStart(struct singleLine * line,
 static int isEntrySeparator(struct singleLine * line,  
823                              struct configFileInfo * cfi) {                              struct configFileInfo * cfi) {
824      if (line->type == LT_WHITESPACE)      return line->type == cfi->entryStart || line->type == LT_OTHER ||
825   return 0;   (cfi->titleBracketed && isBracketedTitle(line));
     if (line->type == cfi->entrySeparator)  
         return 1;  
     if (line->type == LT_OTHER)  
         return 1;  
     if (cfi->titleBracketed && isBracketedTitle(line)) {  
         return 1;  
     }  
     return 0;  
826  }  }
827    
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 389  static void lineInit(struct singleLine * Line 878  static void lineInit(struct singleLine *
878      line->next = NULL;      line->next = NULL;
879  }  }
880    
881  static void lineFree(struct singleLine * line) {  struct singleLine * lineDup(struct singleLine * line) {
882      int i;      struct singleLine * newLine = malloc(sizeof(*newLine));
883    
884        newLine->indent = strdup(line->indent);
885        newLine->next = NULL;
886        newLine->type = line->type;
887        newLine->numElements = line->numElements;
888        newLine->elements = malloc(sizeof(*newLine->elements) *
889           newLine->numElements);
890    
891        for (int i = 0; i < newLine->numElements; i++) {
892     newLine->elements[i].indent = strdup(line->elements[i].indent);
893     newLine->elements[i].item = strdup(line->elements[i].item);
894        }
895    
896        return newLine;
897    }
898    
899    static void lineFree(struct singleLine * line) {
900      if (line->indent) free(line->indent);      if (line->indent) free(line->indent);
901    
902      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
903   free(line->elements[i].item);   free(line->elements[i].item);
904   free(line->elements[i].indent);   free(line->elements[i].indent);
905      }      }
# Line 405  static void lineFree(struct singleLine * Line 910  static void lineFree(struct singleLine *
910    
911  static int lineWrite(FILE * out, struct singleLine * line,  static int lineWrite(FILE * out, struct singleLine * line,
912       struct configFileInfo * cfi) {       struct configFileInfo * cfi) {
     int i;  
   
913      if (fprintf(out, "%s", line->indent) == -1) return -1;      if (fprintf(out, "%s", line->indent) == -1) return -1;
914    
915      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
916     /* Need to handle this, because we strip the quotes from
917     * menuentry when read it. */
918     if (line->type == LT_MENUENTRY && i == 1) {
919        if(!isquote(*line->elements[i].item))
920     fprintf(out, "\'%s\'", line->elements[i].item);
921        else
922     fprintf(out, "%s", line->elements[i].item);
923        fprintf(out, "%s", line->elements[i].indent);
924    
925        continue;
926     }
927    
928   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)   if (i == 1 && line->type == LT_KERNELARGS && cfi->argsInQuotes)
929      if (fputc('"', out) == EOF) return -1;      if (fputc('"', out) == EOF) return -1;
930    
931   if (fprintf(out, "%s", line->elements[i].item) == -1) return -1;   if (fprintf(out, "%s", line->elements[i].item) == -1) return -1;
932   if (fprintf(out, "%s", line->elements[i].indent) == -1) return -1;   if (i < line->numElements - 1)
933        if (fprintf(out, "%s", line->elements[i].indent) == -1) return -1;
934      }      }
935    
936      if (line->type == LT_KERNELARGS && cfi->argsInQuotes)      if (line->type == LT_KERNELARGS && cfi->argsInQuotes)
# Line 433  static int getNextLine(char ** bufPtr, s Line 949  static int getNextLine(char ** bufPtr, s
949      char * chptr;      char * chptr;
950      int elementsAlloced = 0;      int elementsAlloced = 0;
951      struct lineElement * element;      struct lineElement * element;
     struct keywordTypes * keywords = cfi->keywords;  
952      int first = 1;      int first = 1;
     int i;  
953    
954      lineFree(line);      lineFree(line);
955    
# Line 489  static int getNextLine(char ** bufPtr, s Line 1003  static int getNextLine(char ** bufPtr, s
1003      if (!line->numElements)      if (!line->numElements)
1004   line->type = LT_WHITESPACE;   line->type = LT_WHITESPACE;
1005      else {      else {
1006   for (i = 0; keywords[i].key; i++)   line->type = getTypeByKeyword(line->elements[0].item, cfi);
1007      if (!strcmp(line->elements[0].item, keywords[i].key)) break;   if (line->type == LT_UNKNOWN) {
   
  if (keywords[i].key) {  
     line->type = keywords[i].type;  
  } else {  
     line->type = LT_UNKNOWN;  
               
1008              /* zipl does [title] instead of something reasonable like all              /* zipl does [title] instead of something reasonable like all
1009               * the other boot loaders.  kind of ugly */               * the other boot loaders.  kind of ugly */
1010              if (cfi->titleBracketed && isBracketedTitle(line)) {              if (cfi->titleBracketed && isBracketedTitle(line)) {
# Line 510  static int getNextLine(char ** bufPtr, s Line 1018  static int getNextLine(char ** bufPtr, s
1018      if (*line->elements[0].item == '#') {      if (*line->elements[0].item == '#') {
1019   char * fullLine;   char * fullLine;
1020   int len;   int len;
  int i;  
1021    
1022   len = strlen(line->indent);   len = strlen(line->indent);
1023   for (i = 0; i < line->numElements; i++)   for (int i = 0; i < line->numElements; i++)
1024      len += strlen(line->elements[i].item) +      len += strlen(line->elements[i].item) +
1025     strlen(line->elements[i].indent);     strlen(line->elements[i].indent);
1026    
# Line 522  static int getNextLine(char ** bufPtr, s Line 1029  static int getNextLine(char ** bufPtr, s
1029   free(line->indent);   free(line->indent);
1030   line->indent = fullLine;   line->indent = fullLine;
1031    
1032   for (i = 0; i < line->numElements; i++) {   for (int i = 0; i < line->numElements; i++) {
1033      strcat(fullLine, line->elements[i].item);      strcat(fullLine, line->elements[i].item);
1034      strcat(fullLine, line->elements[i].indent);      strcat(fullLine, line->elements[i].indent);
1035      free(line->elements[i].item);      free(line->elements[i].item);
# Line 532  static int getNextLine(char ** bufPtr, s Line 1039  static int getNextLine(char ** bufPtr, s
1039   line->type = LT_WHITESPACE;   line->type = LT_WHITESPACE;
1040   line->numElements = 0;   line->numElements = 0;
1041      }      }
1042     } else {
1043     struct keywordTypes *kw;
1044    
1045     kw = getKeywordByType(line->type, cfi);
1046    
1047     /* space isn't the only separator, we need to split
1048     * elements up more
1049     */
1050     if (!isspace(kw->separatorChar)) {
1051        char indent[2] = "";
1052        indent[0] = kw->separatorChar;
1053        for (int i = 1; i < line->numElements; i++) {
1054     char *p;
1055     int numNewElements;
1056    
1057     numNewElements = 0;
1058     p = line->elements[i].item;
1059     while (*p != '\0') {
1060     if (*p == kw->separatorChar)
1061     numNewElements++;
1062     p++;
1063     }
1064     if (line->numElements + numNewElements >= elementsAlloced) {
1065     elementsAlloced += numNewElements + 5;
1066     line->elements = realloc(line->elements,
1067        sizeof(*line->elements) * elementsAlloced);
1068     }
1069    
1070     for (int j = line->numElements; j > i; j--) {
1071     line->elements[j + numNewElements] = line->elements[j];
1072     }
1073     line->numElements += numNewElements;
1074    
1075     p = line->elements[i].item;
1076     while (*p != '\0') {
1077    
1078     while (*p != kw->separatorChar && *p != '\0') p++;
1079     if (*p == '\0') {
1080     break;
1081     }
1082    
1083     line->elements[i + 1].indent = line->elements[i].indent;
1084     line->elements[i].indent = strdup(indent);
1085     *p++ = '\0';
1086     i++;
1087     line->elements[i].item = strdup(p);
1088     }
1089        }
1090     }
1091   }   }
1092      }      }
1093    
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 549  static struct grubConfig * readConfig(co Line 1114  static struct grubConfig * readConfig(co
1114      struct singleLine * last = NULL, * line, * defaultLine = NULL;      struct singleLine * last = NULL, * line, * defaultLine = NULL;
1115      char * end;      char * end;
1116      struct singleEntry * entry = NULL;      struct singleEntry * entry = NULL;
1117      int i, 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 595  static struct grubConfig * readConfig(co Line 1163  static struct grubConfig * readConfig(co
1163      cfg->secondaryIndent = strdup(line->indent);      cfg->secondaryIndent = strdup(line->indent);
1164   }   }
1165    
1166   if (isEntrySeparator(line, cfi)) {   if (isEntryStart(line, cfi) || (cfg->entries && !sawEntry)) {
1167      sawEntry = 1;      sawEntry = 1;
1168      if (!entry) {      if (!entry) {
1169   cfg->entries = malloc(sizeof(*entry));   cfg->entries = malloc(sizeof(*entry));
# Line 611  static struct grubConfig * readConfig(co Line 1179  static struct grubConfig * readConfig(co
1179      entry->next = NULL;      entry->next = NULL;
1180   }   }
1181    
1182   if (line->type == LT_DEFAULT && line->numElements == 2) {   if (line->type == LT_SET_VARIABLE) {
1183      cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;      dbgPrintf("found 'set' command (%d elements): ", line->numElements);
1184      defaultLine = line;      dbgPrintf("%s", line->indent);
1185        for (int i = 0; i < line->numElements; i++)
1186     dbgPrintf("\"%s\"%s", line->elements[i].item, line->elements[i].indent);
1187        dbgPrintf("\n");
1188        struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
1189        if (kwType && line->numElements == 3 &&
1190        !strcmp(line->elements[1].item, kwType->key) &&
1191        !is_special_grub2_variable(line->elements[2].item)) {
1192     dbgPrintf("Line sets default config\n");
1193     cfg->flags &= ~GRUB_CONFIG_NO_DEFAULT;
1194     defaultLine = line;
1195        }
1196    
1197            } else if (iskernel(line->type)) {
1198        /* if by some freak chance this is multiboot and the "module"
1199         * lines came earlier in the template, make sure to use LT_HYPER
1200         * instead of LT_KERNEL now
1201         */
1202        if (entry && entry->multiboot)
1203     line->type = LT_HYPER;
1204    
1205          } else if (line->type == LT_MBMODULE) {          } else if (line->type == LT_MBMODULE) {
1206        /* go back and fix the LT_KERNEL line to indicate LT_HYPER
1207         * instead, now that we know this is a multiboot entry.
1208         * This only applies to grub, but that's the only place we
1209         * should find LT_MBMODULE lines anyway.
1210         */
1211        for (struct singleLine *l = entry->lines; l; l = l->next) {
1212     if (l->type == LT_HYPER)
1213        break;
1214     else if (iskernel(l->type)) {
1215        l->type = LT_HYPER;
1216        break;
1217     }
1218        }
1219              entry->multiboot = 1;              entry->multiboot = 1;
1220    
1221     } else if (line->type == LT_HYPER) {
1222        entry->multiboot = 1;
1223    
1224   } else if (line->type == LT_FALLBACK && line->numElements == 2) {   } else if (line->type == LT_FALLBACK && line->numElements == 2) {
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   } else if (line->type == LT_TITLE && line->numElements > 1) {  
1228      /* make the title a single argument (undoing our parsing) */   } else if ((line->type == LT_DEFAULT && cfi->defaultIsUnquoted) ||
1229                    (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 (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);
1234   len += strlen(line->elements[i].indent);   len += strlen(line->elements[i].indent);
1235      }      }
1236      buf = malloc(len + 1);      buf = malloc(len + 1);
1237      *buf = '\0';      *buf = '\0';
1238    
1239      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
1240   strcat(buf, line->elements[i].item);   strcat(buf, line->elements[i].item);
1241   free(line->elements[i].item);   free(line->elements[i].item);
1242    
# Line 643  static struct grubConfig * readConfig(co Line 1250  static struct grubConfig * readConfig(co
1250      line->elements[line->numElements - 1].indent;      line->elements[line->numElements - 1].indent;
1251      line->elements[1].item = buf;      line->elements[1].item = buf;
1252      line->numElements = 2;      line->numElements = 2;
1253     } else if (line->type == LT_MENUENTRY && line->numElements > 3) {
1254        /* let --remove-kernel="TITLE=what" work */
1255        len = 0;
1256        char *extras;
1257        char *title;
1258    
1259        for (int i = 1; i < line->numElements; i++) {
1260     len += strlen(line->elements[i].item);
1261     len += strlen(line->elements[i].indent);
1262        }
1263        buf = malloc(len + 1);
1264        *buf = '\0';
1265    
1266        /* allocate mem for extra flags. */
1267        extras = malloc(len + 1);
1268        *extras = '\0';
1269    
1270        /* get title. */
1271        for (int i = 0; i < line->numElements; i++) {
1272     if (!strcmp(line->elements[i].item, "menuentry"))
1273        continue;
1274     if (isquote(*line->elements[i].item))
1275        title = line->elements[i].item + 1;
1276     else
1277        title = line->elements[i].item;
1278    
1279     len = strlen(title);
1280            if (isquote(title[len-1])) {
1281        strncat(buf, title,len-1);
1282        break;
1283     } else {
1284        strcat(buf, title);
1285        strcat(buf, line->elements[i].indent);
1286     }
1287        }
1288    
1289        /* get extras */
1290        int count = 0;
1291        for (int i = 0; i < line->numElements; i++) {
1292     if (count >= 2) {
1293        strcat(extras, line->elements[i].item);
1294        strcat(extras, line->elements[i].indent);
1295     }
1296    
1297     if (!strcmp(line->elements[i].item, "menuentry"))
1298        continue;
1299    
1300     /* count ' or ", there should be two in menuentry line. */
1301     if (isquote(*line->elements[i].item))
1302        count++;
1303    
1304     len = strlen(line->elements[i].item);
1305    
1306     if (isquote(line->elements[i].item[len -1]))
1307        count++;
1308    
1309     /* ok, we get the final ' or ", others are extras. */
1310                }
1311        line->elements[1].indent =
1312     line->elements[line->numElements - 2].indent;
1313        line->elements[1].item = buf;
1314        line->elements[2].indent =
1315     line->elements[line->numElements - 2].indent;
1316        line->elements[2].item = extras;
1317        line->numElements = 3;
1318   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {   } else if (line->type == LT_KERNELARGS && cfi->argsInQuotes) {
1319      /* Strip off any " which may be present; they'll be put back      /* Strip off any " which may be present; they'll be put back
1320         on write. This is one of the few (the only?) places that grubby         on write. This is one of the few (the only?) places that grubby
# Line 651  static struct grubConfig * readConfig(co Line 1323  static struct grubConfig * readConfig(co
1323      if (line->numElements >= 2) {      if (line->numElements >= 2) {
1324   int last, len;   int last, len;
1325    
1326   if (*line->elements[1].item == '"')   if (isquote(*line->elements[1].item))
1327      memcpy(line->elements[1].item, line->elements[1].item + 1,      memmove(line->elements[1].item, line->elements[1].item + 1,
1328     strlen(line->elements[1].item + 1) + 1);      strlen(line->elements[1].item + 1) + 1);
1329    
1330   last = line->numElements - 1;   last = line->numElements - 1;
1331   len = strlen(line->elements[last].item) - 1;   len = strlen(line->elements[last].item) - 1;
1332   if (line->elements[last].item[len] == '"')   if (isquote(line->elements[last].item[len]))
1333      line->elements[last].item[len] = '\0';      line->elements[last].item[len] = '\0';
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
# Line 680  static struct grubConfig * readConfig(co Line 1356  static struct grubConfig * readConfig(co
1356   movedLine = 1;   movedLine = 1;
1357   continue; /* without setting 'last' */   continue; /* without setting 'last' */
1358   }   }
1359    
1360   /* If a second line of whitespace happens after a generic option   /* If a second line of whitespace happens after a generic option
1361     which was moved, drop it. */     which was moved, drop it. */
1362   if (movedLine && line->type == LT_WHITESPACE && last->type == LT_WHITESPACE) {   if (movedLine && line->type == LT_WHITESPACE && last->type == LT_WHITESPACE) {
# Line 695  static struct grubConfig * readConfig(co Line 1372  static struct grubConfig * readConfig(co
1372   entry->lines = line;   entry->lines = line;
1373      else      else
1374   last->next = line;   last->next = line;
1375        dbgPrintf("readConfig added %s to %p\n", getKeyByType(line->type, cfi), entry);
1376    
1377        /* we could have seen this outside of an entry... if so, we
1378         * ignore it like any other line we don't grok */
1379        if (line->type == LT_ENTRY_END && sawEntry)
1380     sawEntry = 0;
1381   } else {   } else {
1382      if (!cfg->theLines)      if (!cfg->theLines)
1383   cfg->theLines = line;   cfg->theLines = line;
1384      else {      else
1385   last->next = line;   last->next = line;
1386      }      dbgPrintf("readConfig added %s to cfg\n", getKeyByType(line->type, cfi));
1387   }   }
1388    
1389   last = line;   last = line;
# Line 708  static struct grubConfig * readConfig(co Line 1391  static struct grubConfig * readConfig(co
1391    
1392      free(incoming);      free(incoming);
1393    
1394        dbgPrintf("defaultLine is %s\n", defaultLine ? "set" : "unset");
1395      if (defaultLine) {      if (defaultLine) {
1396   if (cfi->defaultSupportSaved &&          if (defaultLine->numElements > 2 &&
1397        cfi->defaultSupportSaved &&
1398        !strncmp(defaultLine->elements[2].item,"\"${saved_entry}\"", 16)) {
1399     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) {
1416        char *value = defaultLine->elements[2].item;
1417        while (*value && (*value == '"' || *value == '\'' ||
1418        *value == ' ' || *value == '\t'))
1419     value++;
1420        cfg->defaultImage = strtol(value, &end, 10);
1421        while (*end && (*end == '"' || *end == '\'' ||
1422        *end == ' ' || *end == '\t'))
1423     end++;
1424        if (*end) cfg->defaultImage = -1;
1425     } else if (cfi->defaultSupportSaved &&
1426   !strncmp(defaultLine->elements[1].item, "saved", 5)) {   !strncmp(defaultLine->elements[1].item, "saved", 5)) {
1427      cfg->defaultImage = DEFAULT_SAVED;      cfg->defaultImage = DEFAULT_SAVED;
1428   } else if (cfi->defaultIsIndex) {   } else if (cfi->defaultIsIndex) {
1429      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);
1430      if (*end) cfg->defaultImage = -1;      if (*end) cfg->defaultImage = -1;
1431   } else if (defaultLine->numElements >= 2) {   } else if (defaultLine->numElements >= 2) {
1432      i = 0;      int i = 0;
1433      while ((entry = findEntryByIndex(cfg, i))) {      while ((entry = findEntryByIndex(cfg, i))) {
1434   for (line = entry->lines; line; line = line->next)   for (line = entry->lines; line; line = line->next)
1435      if (line->type == LT_TITLE) break;      if (line->type == LT_TITLE) break;
# Line 730  static struct grubConfig * readConfig(co Line 1443  static struct grubConfig * readConfig(co
1443                                  extractTitle(line))) break;                                  extractTitle(line))) break;
1444                  }                  }
1445   i++;   i++;
1446     entry = NULL;
1447      }      }
1448    
1449      if (entry) cfg->defaultImage = i;      if (entry){
1450            cfg->defaultImage = i;
1451        }else{
1452            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 {
1469            cfg->defaultImage = 0;
1470      }      }
1471    
1472      return cfg;      return cfg;
# Line 749  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 > -1) {      else if (cfg->cfi->defaultIsSaved) {
1486     fprintf(out, "%sset default=\"${saved_entry}\"\n", indent);
1487     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      fprintf(out, "%sdefault%s%d\n", indent, separator,      if (cfg->cfi->defaultIsVariable) {
1502      cfg->defaultImage);          fprintf(out, "%sset default=\"%d\"\n", indent,
1503     cfg->defaultImage);
1504        } else {
1505     fprintf(out, "%sdefault%s%d\n", indent, separator,
1506     cfg->defaultImage);
1507        }
1508   } else {   } else {
1509      int image = cfg->defaultImage;      int image = cfg->defaultImage;
1510    
# Line 769  static void writeDefault(FILE * out, cha Line 1521  static void writeDefault(FILE * out, cha
1521    
1522      if (!entry) return;      if (!entry) return;
1523    
1524      line = entry->lines;      line = getLineByType(LT_TITLE, entry->lines);
     while (line && line->type != LT_TITLE) line = line->next;  
1525    
1526      if (line && line->numElements >= 2)      if (line && line->numElements >= 2)
1527   fprintf(out, "%sdefault%s%s\n", indent, separator,   fprintf(out, "%sdefault%s%s\n", indent, separator,
# Line 804  static int writeConfig(struct grubConfig Line 1555  static int writeConfig(struct grubConfig
1555      int rc;      int rc;
1556    
1557      /* most likely the symlink is relative, so change our      /* most likely the symlink is relative, so change our
1558         directory to / */         directory to the dir of the symlink */
1559      rc = chdir("/");      char *dir = strdupa(outName);
1560        rc = chdir(dirname(dir));
1561      do {      do {
1562   buf = alloca(len + 1);   buf = alloca(len + 1);
1563   rc = readlink(outName, buf, len);   rc = readlink(basename(outName), buf, len);
1564   if (rc == len) len += 256;   if (rc == len) len += 256;
1565      } while (rc == len);      } while (rc == len);
1566            
# Line 843  static int writeConfig(struct grubConfig Line 1595  static int writeConfig(struct grubConfig
1595      }      }
1596    
1597      line = cfg->theLines;      line = cfg->theLines;
1598        struct keywordTypes *defaultKw = getKeywordByType(LT_DEFAULT, cfg->cfi);
1599      while (line) {      while (line) {
1600   if (line->type == LT_DEFAULT) {          if (line->type == LT_SET_VARIABLE && defaultKw &&
1601     line->numElements == 3 &&
1602     !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);
1605        needs &= ~MAIN_DEFAULT;
1606     } else if (line->type == LT_DEFAULT) {
1607      writeDefault(out, line->indent, line->elements[0].indent, cfg);      writeDefault(out, line->indent, line->elements[0].indent, cfg);
1608      needs &= ~MAIN_DEFAULT;      needs &= ~MAIN_DEFAULT;
1609   } else if (line->type == LT_FALLBACK) {   } else if (line->type == LT_FALLBACK) {
# Line 912  static int numEntries(struct grubConfig Line 1671  static int numEntries(struct grubConfig
1671      return i;      return i;
1672  }  }
1673    
1674  int suitableImage(struct singleEntry * entry, const char * bootPrefix,  static char *findDiskForRoot()
1675    int skipRemoved, int flags) {  {
1676      struct singleLine * line;      int fd;
1677      char * fullName;      char buf[65536];
1678      int i;      char *devname;
1679      struct stat sb, sb2;      char *chptr;
1680      char * dev;      int rc;
     char * end;  
     char * rootspec;  
1681    
1682      line = entry->lines;      if ((fd = open(_PATH_MOUNTED, O_RDONLY)) < 0) {
1683      while (line && line->type != LT_KERNEL) line = line->next;          fprintf(stderr, "grubby: failed to open %s: %s\n",
1684                        _PATH_MOUNTED, strerror(errno));
1685      if (!line) return 0;          return NULL;
1686      if (skipRemoved && entry->skip) return 0;      }
     if (line->numElements < 2) return 0;  
1687    
1688      if (flags & GRUBBY_BADIMAGE_OKAY) return 1;      rc = read(fd, buf, sizeof(buf) - 1);
1689        if (rc <= 0) {
1690            fprintf(stderr, "grubby: failed to read %s: %s\n",
1691                    _PATH_MOUNTED, strerror(errno));
1692            close(fd);
1693            return NULL;
1694        }
1695        close(fd);
1696        buf[rc] = '\0';
1697        chptr = buf;
1698    
1699        char *foundanswer = NULL;
1700    
1701        while (chptr && chptr != buf+rc) {
1702            devname = chptr;
1703    
1704            /*
1705             * The first column of a mtab entry is the device, but if the entry is a
1706             * special device it won't start with /, so move on to the next line.
1707             */
1708            if (*devname != '/') {
1709                chptr = strchr(chptr, '\n');
1710                if (chptr)
1711                    chptr++;
1712                continue;
1713            }
1714    
1715            /* Seek to the next space */
1716            chptr = strchr(chptr, ' ');
1717            if (!chptr) {
1718                fprintf(stderr, "grubby: error parsing %s: %s\n",
1719                        _PATH_MOUNTED, strerror(errno));
1720                return NULL;
1721            }
1722    
1723            /*
1724             * The second column of a mtab entry is the mount point, we are looking
1725             * for '/' obviously.
1726             */
1727            if (*(++chptr) == '/' && *(++chptr) == ' ') {
1728                /* remember the last / entry in mtab */
1729               foundanswer = devname;
1730            }
1731    
1732            /* Next line */
1733            chptr = strchr(chptr, '\n');
1734            if (chptr)
1735                chptr++;
1736        }
1737    
1738        /* Return the last / entry found */
1739        if (foundanswer) {
1740            chptr = strchr(foundanswer, ' ');
1741            *chptr = '\0';
1742            return strdup(foundanswer);
1743        }
1744    
1745        return NULL;
1746    }
1747    
1748    void printEntry(struct singleEntry * entry, FILE *f) {
1749        int i;
1750        struct singleLine * line;
1751    
1752        for (line = entry->lines; line; line = line->next) {
1753     log_message(f, "DBG: %s", line->indent);
1754     for (i = 0; i < line->numElements; i++) {
1755        /* Need to handle this, because we strip the quotes from
1756         * menuentry when read it. */
1757        if (line->type == LT_MENUENTRY && i == 1) {
1758     if(!isquote(*line->elements[i].item))
1759        log_message(f, "\'%s\'", line->elements[i].item);
1760     else
1761        log_message(f, "%s", line->elements[i].item);
1762     log_message(f, "%s", line->elements[i].indent);
1763    
1764     continue;
1765        }
1766        
1767        log_message(f, "%s%s",
1768        line->elements[i].item, line->elements[i].indent);
1769     }
1770     log_message(f, "\n");
1771        }
1772    }
1773    
1774    void notSuitablePrintf(struct singleEntry * entry, int okay, const char *fmt, ...)
1775    {
1776        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) {
1793     once = 1;
1794         va_end(argp);
1795     return;
1796        }
1797    
1798        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: ");
1807        vfprintf(stderr, fmt, argp);
1808        printEntry(entry, stderr);
1809        va_end(argp);
1810    }
1811    
1812    #define beginswith(s, c) ((s) && (s)[0] == (c))
1813    
1814    static int endswith(const char *s, char c)
1815    {
1816     int slen;
1817    
1818     if (!s || !s[0])
1819     return 0;
1820     slen = strlen(s) - 1;
1821    
1822     return s[slen] == c;
1823    }
1824    
1825    int suitableImage(struct singleEntry * entry, const char * bootPrefix,
1826      int skipRemoved, int flags) {
1827        struct singleLine * line;
1828        char * fullName;
1829        int i;
1830        char * dev;
1831        char * rootspec;
1832        char * rootdev;
1833    
1834        if (skipRemoved && entry->skip) {
1835     notSuitablePrintf(entry, 0, "marked to skip\n");
1836     return 0;
1837        }
1838    
1839        line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
1840        if (!line) {
1841     notSuitablePrintf(entry, 0, "no line found\n");
1842     return 0;
1843        }
1844        if (line->numElements < 2) {
1845     notSuitablePrintf(entry, 0, "line has only %d elements\n",
1846        line->numElements);
1847     return 0;
1848        }
1849    
1850        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);
1857      rootspec = getRootSpecifier(line->elements[1].item);      rootspec = getRootSpecifier(line->elements[1].item);
1858      sprintf(fullName, "%s%s", bootPrefix,      int rootspec_offset = rootspec ? strlen(rootspec) : 0;
1859              line->elements[1].item + ((rootspec != NULL) ?      int hasslash = endswith(bootPrefix, '/') ||
1860                                        strlen(rootspec) : 0));       beginswith(line->elements[1].item + rootspec_offset, '/');
1861      if (access(fullName, R_OK)) return 0;      sprintf(fullName, "%s%s%s", bootPrefix, hasslash ? "" : "/",
1862                line->elements[1].item + rootspec_offset);
1863        if (access(fullName, R_OK)) {
1864     notSuitablePrintf(entry, 0, "access to %s failed\n", fullName);
1865     return 0;
1866        }
1867      for (i = 2; i < line->numElements; i++)      for (i = 2; i < line->numElements; i++)
1868   if (!strncasecmp(line->elements[i].item, "root=", 5)) break;   if (!strncasecmp(line->elements[i].item, "root=", 5)) break;
1869      if (i < line->numElements) {      if (i < line->numElements) {
1870   dev = line->elements[i].item + 5;   dev = line->elements[i].item + 5;
1871      } else {      } else {
1872   /* look for a lilo style LT_ROOT line */   /* look for a lilo style LT_ROOT line */
1873   line = entry->lines;   line = getLineByType(LT_ROOT, entry->lines);
  while (line && line->type != LT_ROOT) line = line->next;  
1874    
1875   if (line && line->numElements >= 2) {   if (line && line->numElements >= 2) {
1876      dev = line->elements[1].item;      dev = line->elements[1].item;
1877   } else {   } else {
1878              int type;      /* didn't succeed in finding a LT_ROOT, let's try LT_KERNELARGS.
1879      /* didn't succeed in finding a LT_ROOT, let's try LT_KERNELARGS */       * grub+multiboot uses LT_MBMODULE for the args, so check that too.
1880      line = entry->lines;       */
1881        line = getLineByType(LT_KERNELARGS|LT_MBMODULE, entry->lines);
             type = ((entry->multiboot) ? LT_MBMODULE : LT_KERNELARGS);  
   
     while (line && line->type != type) line = line->next;  
1882    
1883              /* failed to find one */              /* failed to find one */
1884              if (!line) return 0;              if (!line) {
1885     notSuitablePrintf(entry, 0, "no line found\n");
1886     return 0;
1887                }
1888    
1889      for (i = 1; i < line->numElements; i++)      for (i = 1; i < line->numElements; i++)
1890          if (!strncasecmp(line->elements[i].item, "root=", 5)) break;          if (!strncasecmp(line->elements[i].item, "root=", 5)) break;
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, 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              }              }
1898   }   }
1899      }      }
1900    
1901      if (!strncmp(dev, "LABEL=", 6)) {      dev = getpathbyspec(dev);
1902   dev += 6;      if (!getpathbyspec(dev)) {
1903            notSuitablePrintf(entry, 0, "can't find blkid entry for %s\n", dev);
1904   /* check which device has this label */          return 0;
1905   dev = get_spec_by_volume_label(dev, &i, &i);      } else
1906   if (!dev) return 0;   dev = getpathbyspec(dev);
1907    
1908        rootdev = findDiskForRoot();
1909        if (!rootdev) {
1910            notSuitablePrintf(entry, 0, "can't find root device\n");
1911     return 0;
1912      }      }
1913    
1914      if (*dev == '/') {      if (!getuuidbydev(rootdev) || !getuuidbydev(dev)) {
1915   if (stat(dev, &sb))          notSuitablePrintf(entry, 0, "uuid missing: rootdev %s, dev %s\n",
1916      return 0;   getuuidbydev(rootdev), getuuidbydev(dev));
1917      } else {          free(rootdev);
1918   sb.st_rdev = strtol(dev, &end, 16);          return 0;
1919   if (*end) return 0;      }
1920    
1921        if (strcmp(getuuidbydev(rootdev), getuuidbydev(dev))) {
1922            notSuitablePrintf(entry, 0, "uuid mismatch: rootdev %s, dev %s\n",
1923     getuuidbydev(rootdev), getuuidbydev(dev));
1924     free(rootdev);
1925            return 0;
1926      }      }
     stat("/", &sb2);  
1927    
1928      if (sb.st_rdev != sb2.st_dev) return 0;      free(rootdev);
1929        notSuitablePrintf(entry, 1, "\n");
1930    
1931      return 1;      return 1;
1932  }  }
# Line 1024  struct singleEntry * findEntryByPath(str Line 1960  struct singleEntry * findEntryByPath(str
1960   }   }
1961    
1962   indexVars[i + 1] = -1;   indexVars[i + 1] = -1;
1963    
1964   i = 0;   i = 0;
1965   if (index) {   if (index) {
1966      while (i < *index) i++;      while (i < *index) {
1967      if (indexVars[i] == -1) return NULL;   i++;
1968     if (indexVars[i] == -1) return NULL;
1969        }
1970   }   }
1971    
1972   entry = findEntryByIndex(config, indexVars[i]);   entry = findEntryByIndex(config, indexVars[i]);
1973   if (!entry) return NULL;   if (!entry) return NULL;
1974    
1975   line = entry->lines;   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
  while (line && line->type != LT_KERNEL)  
     line = line->next;  
   
1976   if (!line) return NULL;   if (!line) return NULL;
1977    
1978   if (index) *index = indexVars[i];   if (index) *index = indexVars[i];
# Line 1075  struct singleEntry * findEntryByPath(str Line 2010  struct singleEntry * findEntryByPath(str
2010    
2011   if (!strncmp(kernel, "TITLE=", 6)) {   if (!strncmp(kernel, "TITLE=", 6)) {
2012      prefix = "";      prefix = "";
2013      checkType = LT_TITLE;      checkType = LT_TITLE|LT_MENUENTRY;
2014      kernel += 6;      kernel += 6;
2015   }   }
2016    
2017   while ((entry = findEntryByIndex(config, i))) {   for (entry = findEntryByIndex(config, i); entry; entry = entry->next, i++) {
2018      line = entry->lines;      if (entry->skip) continue;
     while (line && line->type != checkType) line=line->next;  
2019    
2020        dbgPrintf("findEntryByPath looking for %d %s in %p\n", checkType, kernel, entry);
2021    
2022      if (line && line->numElements >= 2 && !entry->skip) {      /* check all the lines matching checkType */
2023                  rootspec = getRootSpecifier(line->elements[1].item);      for (line = entry->lines; line; line = line->next) {
2024          if (!strcmp(line->elements[1].item  +   enum lineType_e ct = checkType;
2025                              ((rootspec != NULL) ? strlen(rootspec) : 0),   if (entry->multiboot && checkType == LT_KERNEL)
2026                              kernel + strlen(prefix)))      ct = LT_KERNEL|LT_KERNEL_EFI|LT_MBMODULE|LT_HYPER|LT_KERNEL_16;
2027                      break;   else if (checkType & LT_KERNEL)
2028              }      ct = checkType | LT_KERNEL_EFI | LT_KERNEL_16;
2029                 line = getLineByType(ct, line);
2030              /* have to check multiboot lines too */   if (!line)
2031              if (entry->multiboot) {      break;  /* not found in this entry */
2032                  while (line && line->type != LT_MBMODULE) line = line->next;  
2033                  if (line && line->numElements >= 2 && !entry->skip) {   if (line && line->type != LT_MENUENTRY &&
2034                      rootspec = getRootSpecifier(line->elements[1].item);   line->numElements >= 2) {
2035                      if (!strcmp(line->elements[1].item  +      rootspec = getRootSpecifier(line->elements[1].item);
2036                                  ((rootspec != NULL) ? strlen(rootspec) : 0),      if (!strcmp(line->elements[1].item +
2037                                  kernel + strlen(prefix)))   ((rootspec != NULL) ? strlen(rootspec) : 0),
2038                          break;   kernel + strlen(prefix)))
2039                  }   break;
2040              }   }
2041     if(line->type == LT_MENUENTRY &&
2042     !strcmp(line->elements[1].item, kernel))
2043        break;
2044        }
2045    
2046      i++;      /* make sure this entry has a kernel identifier; this skips
2047         * non-Linux boot entries (could find netbsd etc, though, which is
2048         * unfortunate)
2049         */
2050        if (line && getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines))
2051     break; /* found 'im! */
2052   }   }
2053    
2054   if (index) *index = i;   if (index) *index = i;
2055      }      }
2056    
2057      if (!entry) return NULL;      return entry;
2058    }
2059    
2060      /* make sure this entry has a kernel identifier; this skips non-Linux  struct singleEntry * findEntryByTitle(struct grubConfig * cfg, char *title,
2061         boot entries (could find netbsd etc, though, which is unfortunate) */        int * index) {
2062      line = entry->lines;      struct singleEntry * entry;
2063      while (line && line->type != LT_KERNEL) line = line->next;      struct singleLine * line;
2064      if (!line) {      int i;
2065   if (!index) index = &i;      char * newtitle;
2066   (*index)++;  
2067   return findEntryByPath(config, kernel, prefix, index);      for (i = 0, entry = cfg->entries; entry; entry = entry->next, i++) {
2068     if (index && i < *index)
2069        continue;
2070     line = getLineByType(LT_TITLE, entry->lines);
2071     if (!line)
2072        line = getLineByType(LT_MENUENTRY, entry->lines);
2073     if (!line)
2074        continue;
2075     newtitle = grub2ExtractTitle(line);
2076     if (!newtitle)
2077        continue;
2078     if (!strcmp(title, newtitle))
2079        break;
2080      }      }
2081    
2082        if (!entry)
2083     return NULL;
2084    
2085        if (index)
2086     *index = i;
2087      return entry;      return entry;
2088  }  }
2089    
# Line 1147  struct singleEntry * findTemplate(struct Line 2109  struct singleEntry * findTemplate(struct
2109      struct singleEntry * entry, * entry2;      struct singleEntry * entry, * entry2;
2110      int index;      int index;
2111    
2112      if (cfg->defaultImage > -1) {      if (cfg->cfi->defaultIsSaved) {
2113     if (cfg->cfi->getEnv) {
2114        char *defTitle = cfg->cfi->getEnv(cfg->cfi, "saved_entry");
2115        if (defTitle) {
2116     int index = 0;
2117     if (isnumber(defTitle)) {
2118        index = atoi(defTitle);
2119        entry = findEntryByIndex(cfg, index);
2120     } else {
2121        entry = findEntryByTitle(cfg, defTitle, &index);
2122     }
2123     if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
2124        cfg->defaultImage = index;
2125        if (indexPtr)
2126     *indexPtr = index;
2127        return entry;
2128     }
2129        }
2130     }
2131        } else if (cfg->defaultImage > -1) {
2132   entry = findEntryByIndex(cfg, cfg->defaultImage);   entry = findEntryByIndex(cfg, cfg->defaultImage);
2133   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {   if (entry && suitableImage(entry, prefix, skipRemoved, flags)) {
2134      if (indexPtr) *indexPtr = cfg->defaultImage;      if (indexPtr) *indexPtr = cfg->defaultImage;
# Line 1200  void markRemovedImage(struct grubConfig Line 2181  void markRemovedImage(struct grubConfig
2181        const char * prefix) {        const char * prefix) {
2182      struct singleEntry * entry;      struct singleEntry * entry;
2183    
2184      if (!image) return;      if (!image)
2185     return;
2186    
2187        /* check and see if we're removing the default image */
2188        if (isdigit(*image)) {
2189     entry = findEntryByPath(cfg, image, prefix, NULL);
2190     if(entry)
2191        entry->skip = 1;
2192     return;
2193        }
2194    
2195      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))      while ((entry = findEntryByPath(cfg, image, prefix, NULL)))
2196   entry->skip = 1;   entry->skip = 1;
# Line 1208  void markRemovedImage(struct grubConfig Line 2198  void markRemovedImage(struct grubConfig
2198    
2199  void setDefaultImage(struct grubConfig * config, int hasNew,  void setDefaultImage(struct grubConfig * config, int hasNew,
2200       const char * defaultKernelPath, int newIsDefault,       const char * defaultKernelPath, int newIsDefault,
2201       const char * prefix, int flags) {       const char * prefix, int flags, int index) {
2202      struct singleEntry * entry, * entry2, * newDefault;      struct singleEntry * entry, * entry2, * newDefault;
2203      int i, j;      int i, j;
2204    
2205      if (newIsDefault) {      if (newIsDefault) {
2206   config->defaultImage = 0;   config->defaultImage = 0;
2207   return;   return;
2208        } else if ((index >= 0) && config->cfi->defaultIsIndex) {
2209     if (findEntryByIndex(config, index))
2210        config->defaultImage = index;
2211     else
2212        config->defaultImage = -1;
2213     return;
2214      } else if (defaultKernelPath) {      } else if (defaultKernelPath) {
2215   i = 0;   i = 0;
2216   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {   if (findEntryByPath(config, defaultKernelPath, prefix, &i)) {
# Line 1227  void setDefaultImage(struct grubConfig * Line 2223  void setDefaultImage(struct grubConfig *
2223    
2224      /* defaultImage now points to what we'd like to use, but before any order      /* defaultImage now points to what we'd like to use, but before any order
2225         changes */         changes */
2226      if (config->defaultImage == DEFAULT_SAVED)      if ((config->defaultImage == DEFAULT_SAVED) ||
2227     (config->defaultImage == DEFAULT_SAVED_GRUB2))
2228        /* default is set to saved, we don't want to change it */        /* default is set to saved, we don't want to change it */
2229        return;        return;
2230    
# Line 1285  void displayEntry(struct singleEntry * e Line 2282  void displayEntry(struct singleEntry * e
2282      struct singleLine * line;      struct singleLine * line;
2283      char * root = NULL;      char * root = NULL;
2284      int i;      int i;
2285        int j;
     line = entry->lines;  
     while (line && line->type != LT_KERNEL) line = line->next;  
2286    
2287      printf("index=%d\n", index);      printf("index=%d\n", index);
2288    
2289      printf("kernel=%s\n", line->elements[1].item);      line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
2290        if (!line) {
2291            printf("non linux entry\n");
2292            return;
2293        }
2294    
2295        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
2296     printf("kernel=%s\n", line->elements[1].item);
2297        else
2298     printf("kernel=%s%s\n", prefix, line->elements[1].item);
2299    
2300      if (line->numElements >= 3) {      if (line->numElements >= 3) {
2301   printf("args=\"");   printf("args=\"");
# Line 1308  void displayEntry(struct singleEntry * e Line 2312  void displayEntry(struct singleEntry * e
2312   }   }
2313   printf("\"\n");   printf("\"\n");
2314      } else {      } else {
2315   line = entry->lines;   line = getLineByType(LT_KERNELARGS, entry->lines);
  while (line && line->type != LT_KERNELARGS) line=line->next;  
   
2316   if (line) {   if (line) {
2317      char * s;      char * s;
2318    
# Line 1334  void displayEntry(struct singleEntry * e Line 2336  void displayEntry(struct singleEntry * e
2336      }      }
2337    
2338      if (!root) {      if (!root) {
2339   line = entry->lines;   line = getLineByType(LT_ROOT, entry->lines);
  while (line && line->type != LT_ROOT) line = line->next;  
   
2340   if (line && line->numElements >= 2)   if (line && line->numElements >= 2)
2341      root=line->elements[1].item;      root=line->elements[1].item;
2342      }      }
# Line 1351  void displayEntry(struct singleEntry * e Line 2351  void displayEntry(struct singleEntry * e
2351   printf("root=%s\n", s);   printf("root=%s\n", s);
2352      }      }
2353    
2354      line = entry->lines;      line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
     while (line && line->type != LT_INITRD) line = line->next;  
2355    
2356      if (line && line->numElements >= 2) {      if (line && line->numElements >= 2) {
2357   printf("initrd=%s", prefix);   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
2358        printf("initrd=");
2359     else
2360        printf("initrd=%s", prefix);
2361    
2362   for (i = 1; i < line->numElements; i++)   for (i = 1; i < line->numElements; i++)
2363      printf("%s%s", line->elements[i].item, line->elements[i].indent);      printf("%s%s", line->elements[i].item, line->elements[i].indent);
2364   printf("\n");   printf("\n");
2365      }      }
2366    
2367        line = getLineByType(LT_TITLE, entry->lines);
2368        if (line) {
2369     printf("title=%s\n", line->elements[1].item);
2370        } else {
2371     char * title;
2372     line = getLineByType(LT_MENUENTRY, entry->lines);
2373     title = grub2ExtractTitle(line);
2374     if (title)
2375        printf("title=%s\n", title);
2376        }
2377    
2378        for (j = 0, line = entry->lines; line; line = line->next) {
2379     if ((line->type & LT_MBMODULE) && line->numElements >= 2) {
2380        if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
2381     printf("mbmodule%d=", j);
2382        else
2383     printf("mbmodule%d=%s", j, prefix);
2384    
2385        for (i = 1; i < line->numElements; i++)
2386     printf("%s%s", line->elements[i].item, line->elements[i].indent);
2387        printf("\n");
2388        j++;
2389     }
2390        }
2391    }
2392    
2393    int isSuseSystem(void) {
2394        const char * path;
2395        const static char default_path[] = "/etc/SuSE-release";
2396    
2397        if ((path = getenv("GRUBBY_SUSE_RELEASE")) == NULL)
2398     path = default_path;
2399    
2400        if (!access(path, R_OK))
2401     return 1;
2402        return 0;
2403    }
2404    
2405    int isSuseGrubConf(const char * path) {
2406        FILE * grubConf;
2407        char * line = NULL;
2408        size_t len = 0, res = 0;
2409    
2410        grubConf = fopen(path, "r");
2411        if (!grubConf) {
2412            dbgPrintf("Could not open SuSE configuration file '%s'\n", path);
2413     return 0;
2414        }
2415    
2416        while ((res = getline(&line, &len, grubConf)) != -1) {
2417     if (!strncmp(line, "setup", 5)) {
2418        fclose(grubConf);
2419        free(line);
2420        return 1;
2421     }
2422        }
2423    
2424        dbgPrintf("SuSE configuration file '%s' does not appear to be valid\n",
2425          path);
2426    
2427        fclose(grubConf);
2428        free(line);
2429        return 0;
2430    }
2431    
2432    int suseGrubConfGetLba(const char * path, int * lbaPtr) {
2433        FILE * grubConf;
2434        char * line = NULL;
2435        size_t res = 0, len = 0;
2436    
2437        if (!path) return 1;
2438        if (!lbaPtr) return 1;
2439    
2440        grubConf = fopen(path, "r");
2441        if (!grubConf) return 1;
2442    
2443        while ((res = getline(&line, &len, grubConf)) != -1) {
2444     if (line[res - 1] == '\n')
2445        line[res - 1] = '\0';
2446     else if (len > res)
2447        line[res] = '\0';
2448     else {
2449        line = realloc(line, res + 1);
2450        line[res] = '\0';
2451     }
2452    
2453     if (!strncmp(line, "setup", 5)) {
2454        if (strstr(line, "--force-lba")) {
2455            *lbaPtr = 1;
2456        } else {
2457            *lbaPtr = 0;
2458        }
2459        dbgPrintf("lba: %i\n", *lbaPtr);
2460        break;
2461     }
2462        }
2463    
2464        free(line);
2465        fclose(grubConf);
2466        return 0;
2467    }
2468    
2469    int suseGrubConfGetInstallDevice(const char * path, char ** devicePtr) {
2470        FILE * grubConf;
2471        char * line = NULL;
2472        size_t res = 0, len = 0;
2473        char * lastParamPtr = NULL;
2474        char * secLastParamPtr = NULL;
2475        char installDeviceNumber = '\0';
2476        char * bounds = NULL;
2477    
2478        if (!path) return 1;
2479        if (!devicePtr) return 1;
2480    
2481        grubConf = fopen(path, "r");
2482        if (!grubConf) return 1;
2483    
2484        while ((res = getline(&line, &len, grubConf)) != -1) {
2485     if (strncmp(line, "setup", 5))
2486        continue;
2487    
2488     if (line[res - 1] == '\n')
2489        line[res - 1] = '\0';
2490     else if (len > res)
2491        line[res] = '\0';
2492     else {
2493        line = realloc(line, res + 1);
2494        line[res] = '\0';
2495     }
2496    
2497     lastParamPtr = bounds = line + res;
2498    
2499     /* Last parameter in grub may be an optional IMAGE_DEVICE */
2500     while (!isspace(*lastParamPtr))
2501        lastParamPtr--;
2502     lastParamPtr++;
2503    
2504     secLastParamPtr = lastParamPtr - 2;
2505     dbgPrintf("lastParamPtr: %s\n", lastParamPtr);
2506    
2507     if (lastParamPtr + 3 > bounds) {
2508        dbgPrintf("lastParamPtr going over boundary");
2509        fclose(grubConf);
2510        free(line);
2511        return 1;
2512     }
2513     if (!strncmp(lastParamPtr, "(hd", 3))
2514        lastParamPtr += 3;
2515     dbgPrintf("lastParamPtr: %c\n", *lastParamPtr);
2516    
2517     /*
2518     * Second last parameter will decide wether last parameter is
2519     * an IMAGE_DEVICE or INSTALL_DEVICE
2520     */
2521     while (!isspace(*secLastParamPtr))
2522        secLastParamPtr--;
2523     secLastParamPtr++;
2524    
2525     if (secLastParamPtr + 3 > bounds) {
2526        dbgPrintf("secLastParamPtr going over boundary");
2527        fclose(grubConf);
2528        free(line);
2529        return 1;
2530     }
2531     dbgPrintf("secLastParamPtr: %s\n", secLastParamPtr);
2532     if (!strncmp(secLastParamPtr, "(hd", 3)) {
2533        secLastParamPtr += 3;
2534        dbgPrintf("secLastParamPtr: %c\n", *secLastParamPtr);
2535        installDeviceNumber = *secLastParamPtr;
2536     } else {
2537        installDeviceNumber = *lastParamPtr;
2538     }
2539    
2540     *devicePtr = malloc(6);
2541     snprintf(*devicePtr, 6, "(hd%c)", installDeviceNumber);
2542     dbgPrintf("installDeviceNumber: %c\n", installDeviceNumber);
2543     fclose(grubConf);
2544     free(line);
2545     return 0;
2546        }
2547    
2548        free(line);
2549        fclose(grubConf);
2550        return 1;
2551    }
2552    
2553    int grubGetBootFromDeviceMap(const char * device,
2554         char ** bootPtr) {
2555        FILE * deviceMap;
2556        char * line = NULL;
2557        size_t res = 0, len = 0;
2558        char * devicePtr;
2559        char * bounds = NULL;
2560        const char * path;
2561        const static char default_path[] = "/boot/grub/device.map";
2562    
2563        if (!device) return 1;
2564        if (!bootPtr) return 1;
2565    
2566        if ((path = getenv("GRUBBY_GRUB_DEVICE_MAP")) == NULL)
2567     path = default_path;
2568    
2569        dbgPrintf("opening grub device.map file from: %s\n", path);
2570        deviceMap = fopen(path, "r");
2571        if (!deviceMap)
2572     return 1;
2573    
2574        while ((res = getline(&line, &len, deviceMap)) != -1) {
2575            if (!strncmp(line, "#", 1))
2576        continue;
2577    
2578     if (line[res - 1] == '\n')
2579        line[res - 1] = '\0';
2580     else if (len > res)
2581        line[res] = '\0';
2582     else {
2583        line = realloc(line, res + 1);
2584        line[res] = '\0';
2585     }
2586    
2587     devicePtr = line;
2588     bounds = line + res;
2589    
2590     while ((isspace(*line) && ((devicePtr + 1) <= bounds)))
2591        devicePtr++;
2592     dbgPrintf("device: %s\n", devicePtr);
2593    
2594     if (!strncmp(devicePtr, device, strlen(device))) {
2595        devicePtr += strlen(device);
2596        while (isspace(*devicePtr) && ((devicePtr + 1) <= bounds))
2597            devicePtr++;
2598    
2599        *bootPtr = strdup(devicePtr);
2600        break;
2601     }
2602        }
2603    
2604        free(line);
2605        fclose(deviceMap);
2606        return 0;
2607    }
2608    
2609    int suseGrubConfGetBoot(const char * path, char ** bootPtr) {
2610        char * grubDevice;
2611    
2612        if (suseGrubConfGetInstallDevice(path, &grubDevice))
2613     dbgPrintf("error looking for grub installation device\n");
2614        else
2615     dbgPrintf("grubby installation device: %s\n", grubDevice);
2616    
2617        if (grubGetBootFromDeviceMap(grubDevice, bootPtr))
2618     dbgPrintf("error looking for grub boot device\n");
2619        else
2620     dbgPrintf("grubby boot device: %s\n", *bootPtr);
2621    
2622        free(grubDevice);
2623        return 0;
2624    }
2625    
2626    int parseSuseGrubConf(int * lbaPtr, char ** bootPtr) {
2627        /*
2628         * This SuSE grub configuration file at this location is not your average
2629         * grub configuration file, but instead the grub commands used to setup
2630         * grub on that system.
2631         */
2632        const char * path;
2633        const static char default_path[] = "/etc/grub.conf";
2634    
2635        if ((path = getenv("GRUBBY_SUSE_GRUB_CONF")) == NULL)
2636     path = default_path;
2637    
2638        if (!isSuseGrubConf(path)) return 1;
2639    
2640        if (lbaPtr) {
2641            *lbaPtr = 0;
2642            if (suseGrubConfGetLba(path, lbaPtr))
2643                return 1;
2644        }
2645    
2646        if (bootPtr) {
2647            *bootPtr = NULL;
2648            suseGrubConfGetBoot(path, bootPtr);
2649        }
2650    
2651        return 0;
2652  }  }
2653    
2654  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {
# Line 1369  int parseSysconfigGrub(int * lbaPtr, cha Line 2658  int parseSysconfigGrub(int * lbaPtr, cha
2658      char * start;      char * start;
2659      char * param;      char * param;
2660    
2661      in = fopen("/etc/sysconfig/grub", "r");      in = fopen("/etc/conf.d/grub", "r");
2662      if (!in) return 1;      if (!in) return 1;
2663    
2664      if (lbaPtr) *lbaPtr = 0;      if (lbaPtr) *lbaPtr = 0;
# Line 1410  int parseSysconfigGrub(int * lbaPtr, cha Line 2699  int parseSysconfigGrub(int * lbaPtr, cha
2699  }  }
2700    
2701  void dumpSysconfigGrub(void) {  void dumpSysconfigGrub(void) {
2702      char * boot;      char * boot = NULL;
2703      int lba;      int lba;
2704    
2705      if (!parseSysconfigGrub(&lba, &boot)) {      if (isSuseSystem()) {
2706   if (lba) printf("lba\n");          if (parseSuseGrubConf(&lba, &boot)) {
2707   if (boot) printf("boot=%s\n", boot);      free(boot);
2708        return;
2709     }
2710        } else {
2711            if (parseSysconfigGrub(&lba, &boot)) {
2712        free(boot);
2713        return;
2714     }
2715        }
2716    
2717        if (lba) printf("lba\n");
2718        if (boot) {
2719     printf("boot=%s\n", boot);
2720     free(boot);
2721      }      }
2722  }  }
2723    
# Line 1431  int displayInfo(struct grubConfig * conf Line 2733  int displayInfo(struct grubConfig * conf
2733   return 1;   return 1;
2734      }      }
2735    
2736      /* this is a horrible hack to support /etc/sysconfig/grub; there must      /* this is a horrible hack to support /etc/conf.d/grub; there must
2737         be a better way */         be a better way */
2738      if (config->cfi == &grubConfigType) {      if (config->cfi == &grubConfigType) {
2739   dumpSysconfigGrub();   dumpSysconfigGrub();
2740      } else {      } else {
2741   line = config->theLines;   line = getLineByType(LT_BOOT, config->theLines);
  while (line && line->type != LT_BOOT) line = line->next;  
2742   if (line && line->numElements >= 1) {   if (line && line->numElements >= 1) {
2743      printf("boot=%s\n", line->elements[1].item);      printf("boot=%s\n", line->elements[1].item);
2744   }   }
2745    
2746   line = config->theLines;   line = getLineByType(LT_LBA, config->theLines);
  while (line && line->type != LT_LBA) line = line->next;  
2747   if (line) printf("lba\n");   if (line) printf("lba\n");
2748      }      }
2749    
# Line 1458  int displayInfo(struct grubConfig * conf Line 2758  int displayInfo(struct grubConfig * conf
2758      return 0;      return 0;
2759  }  }
2760    
2761    struct singleLine * addLineTmpl(struct singleEntry * entry,
2762     struct singleLine * tmplLine,
2763     struct singleLine * prevLine,
2764     const char * val,
2765     struct configFileInfo * cfi)
2766    {
2767        struct singleLine * newLine = lineDup(tmplLine);
2768    
2769        if (isEfi && cfi == &grub2ConfigType) {
2770     enum lineType_e old = newLine->type;
2771     newLine->type = preferredLineType(newLine->type, cfi);
2772     if (old != newLine->type)
2773        newLine->elements[0].item = getKeyByType(newLine->type, cfi);
2774        }
2775    
2776        if (val) {
2777     /* override the inherited value with our own.
2778     * This is a little weak because it only applies to elements[1]
2779     */
2780     if (newLine->numElements > 1)
2781        removeElement(newLine, 1);
2782     insertElement(newLine, val, 1, cfi);
2783    
2784     /* but try to keep the rootspec from the template... sigh */
2785     if (tmplLine->type & (LT_HYPER|LT_KERNEL|LT_MBMODULE|LT_INITRD|LT_KERNEL_EFI|LT_INITRD_EFI|LT_KERNEL_16|LT_INITRD_16)) {
2786        char * rootspec = getRootSpecifier(tmplLine->elements[1].item);
2787        if (rootspec != NULL) {
2788     free(newLine->elements[1].item);
2789     newLine->elements[1].item =
2790        sdupprintf("%s%s", rootspec, val);
2791        }
2792     }
2793        }
2794    
2795        dbgPrintf("addLineTmpl(%s)\n", newLine->numElements ?
2796          newLine->elements[0].item : "");
2797    
2798        if (!entry->lines) {
2799     /* first one on the list */
2800     entry->lines = newLine;
2801        } else if (prevLine) {
2802     /* add after prevLine */
2803     newLine->next = prevLine->next;
2804     prevLine->next = newLine;
2805        }
2806    
2807        return newLine;
2808    }
2809    
2810  /* val may be NULL */  /* val may be NULL */
2811  struct singleLine *  addLine(struct singleEntry * entry,  struct singleLine *  addLine(struct singleEntry * entry,
2812       struct configFileInfo * cfi,       struct configFileInfo * cfi,
2813       enum lineType_e type, const char * defaultIndent,       enum lineType_e type, char * defaultIndent,
2814       char * val) {       const char * val) {
2815      struct singleLine * line, * prev;      struct singleLine * line, * prev;
2816      int i;      struct keywordTypes * kw;
2817        struct singleLine tmpl;
2818    
2819      for (i = 0; cfi->keywords[i].key; i++)      /* NB: This function shouldn't allocate items on the heap, rather on the
2820   if (cfi->keywords[i].type == type) break;       * stack since it calls addLineTmpl which will make copies.
2821      if (type != LT_TITLE || !cfi->titleBracketed)       */
2822          if (!cfi->keywords[i].key) abort();      if (type == LT_TITLE && cfi->titleBracketed) {
2823     /* we're doing a bracketed title (zipl) */
2824     tmpl.type = type;
2825     tmpl.numElements = 1;
2826     tmpl.elements = alloca(sizeof(*tmpl.elements));
2827     tmpl.elements[0].item = alloca(strlen(val)+3);
2828     sprintf(tmpl.elements[0].item, "[%s]", val);
2829     tmpl.elements[0].indent = "";
2830     val = NULL;
2831        } else if (type == LT_MENUENTRY) {
2832     char *lineend = "--class gnu-linux --class gnu --class os {";
2833     if (!val) {
2834        fprintf(stderr, "Line type LT_MENUENTRY requires a value\n");
2835        abort();
2836     }
2837     kw = getKeywordByType(type, cfi);
2838     if (!kw) {
2839        fprintf(stderr, "Looking up keyword for unknown type %d\n", type);
2840        abort();
2841     }
2842     tmpl.indent = "";
2843     tmpl.type = type;
2844     tmpl.numElements = 3;
2845     tmpl.elements = alloca(sizeof(*tmpl.elements) * tmpl.numElements);
2846     tmpl.elements[0].item = kw->key;
2847     tmpl.elements[0].indent = alloca(2);
2848     sprintf(tmpl.elements[0].indent, "%c", kw->nextChar);
2849     tmpl.elements[1].item = (char *)val;
2850     tmpl.elements[1].indent = alloca(2);
2851     sprintf(tmpl.elements[1].indent, "%c", kw->nextChar);
2852     tmpl.elements[2].item = alloca(strlen(lineend)+1);
2853     strcpy(tmpl.elements[2].item, lineend);
2854     tmpl.elements[2].indent = "";
2855        } else {
2856     kw = getKeywordByType(type, cfi);
2857     if (!kw) {
2858        fprintf(stderr, "Looking up keyword for unknown type %d\n", type);
2859        abort();
2860     }
2861     tmpl.type = type;
2862     tmpl.numElements = val ? 2 : 1;
2863     tmpl.elements = alloca(sizeof(*tmpl.elements) * tmpl.numElements);
2864     tmpl.elements[0].item = kw->key;
2865     tmpl.elements[0].indent = alloca(2);
2866     sprintf(tmpl.elements[0].indent, "%c", kw->nextChar);
2867     if (val) {
2868        tmpl.elements[1].item = (char *)val;
2869        tmpl.elements[1].indent = "";
2870     }
2871        }
2872    
2873      /* The last non-empty line gives us the indention to us and the line      /* The last non-empty line gives us the indention to us and the line
2874         to insert after. Note that comments are considered empty lines, which         to insert after. Note that comments are considered empty lines, which
2875         may not be ideal? If there are no lines or we are looking at the         may not be ideal? If there are no lines or we are looking at the
2876         first line, we use defaultIndent (the first line is normally indented         first line, we use defaultIndent (the first line is normally indented
2877         differently from the rest) */         differently from the rest) */
2878      if (entry->lines) {      for (line = entry->lines, prev = NULL; line; line = line->next) {
2879   line = entry->lines;   if (line->numElements) prev = line;
2880   prev = NULL;   /* fall back on the last line if prev isn't otherwise set */
2881   while (line) {   if (!line->next && !prev) prev = line;
     if (line->numElements) prev = line;  
     line = line->next;  
  }  
  if (!prev) {  
     /* just use the last line */  
     prev = entry->lines;  
     while (prev->next) prev = prev->next;  
  }  
   
  line = prev->next;  
  prev->next = malloc(sizeof(*line));  
  prev->next->next = line;  
  line = prev->next;  
   
  if (prev == entry->lines)  
     line->indent = strdup(defaultIndent);  
  else  
     line->indent = strdup(prev->indent);  
     } else {  
  line = malloc(sizeof(*line));  
  line->indent = strdup(defaultIndent);  
  line->next = NULL;  
2882      }      }
2883    
2884      if (type != LT_TITLE || !cfi->titleBracketed) {      struct singleLine *menuEntry;
2885          line->type = type;      menuEntry = getLineByType(LT_MENUENTRY, entry->lines);
2886          line->numElements = val ? 2 : 1;      if (tmpl.type == LT_ENTRY_END) {
2887          line->elements = malloc(sizeof(*line->elements) * line->numElements);   if (menuEntry)
2888          line->elements[0].item = strdup(cfi->keywords[i].key);      tmpl.indent = menuEntry->indent;
2889          line->elements[0].indent = malloc(2);   else
2890          line->elements[0].indent[0] = cfi->keywords[i].nextChar;      tmpl.indent = defaultIndent ?: "";
2891          line->elements[0].indent[1] = '\0';      } else if (tmpl.type != LT_MENUENTRY) {
2892             if (menuEntry)
2893          if (val) {      tmpl.indent = "\t";
2894              line->elements[1].item = val;   else if (prev == entry->lines)
2895              line->elements[1].indent = strdup("");      tmpl.indent = defaultIndent ?: "";
2896          }   else
2897      } else {      tmpl.indent = prev->indent;
         /* we're doing the title of a bracketed title (zipl) */  
         line->type = type;  
         line->numElements = 1;  
         line->elements = malloc(sizeof(*line->elements) * line->numElements);  
   
         line->elements[0].item = malloc(strlen(val) + 3);  
         sprintf(line->elements[0].item, "[%s]", val);  
         line->elements[0].indent = strdup("");  
2898      }      }
2899    
2900      return line;      return addLineTmpl(entry, &tmpl, prev, val, cfi);
2901  }  }
2902    
2903  void removeLine(struct singleEntry * entry, struct singleLine * line) {  void removeLine(struct singleEntry * entry, struct singleLine * line) {
# Line 1553  void removeLine(struct singleEntry * ent Line 2922  void removeLine(struct singleEntry * ent
2922      free(line);      free(line);
2923  }  }
2924    
2925    static void requote(struct singleLine *tmplLine, struct configFileInfo * cfi)
2926    {
2927        struct singleLine newLine = {
2928     .indent = tmplLine->indent,
2929     .type = tmplLine->type,
2930     .next = tmplLine->next,
2931        };
2932        int firstQuotedItem = -1;
2933        int quoteLen = 0;
2934        int j;
2935        int element = 0;
2936        char *c;
2937    
2938        c = malloc(strlen(tmplLine->elements[0].item) + 1);
2939        strcpy(c, tmplLine->elements[0].item);
2940        insertElement(&newLine, c, element++, cfi);
2941        free(c);
2942        c = NULL;
2943    
2944        for (j = 1; j < tmplLine->numElements; j++) {
2945     if (firstQuotedItem == -1) {
2946        quoteLen += strlen(tmplLine->elements[j].item);
2947        
2948        if (isquote(tmplLine->elements[j].item[0])) {
2949     firstQuotedItem = j;
2950            quoteLen += strlen(tmplLine->elements[j].indent);
2951        } else {
2952     c = malloc(quoteLen + 1);
2953     strcpy(c, tmplLine->elements[j].item);
2954     insertElement(&newLine, c, element++, cfi);
2955     free(c);
2956     quoteLen = 0;
2957        }
2958     } else {
2959        int itemlen = strlen(tmplLine->elements[j].item);
2960        quoteLen += itemlen;
2961        quoteLen += strlen(tmplLine->elements[j].indent);
2962        
2963        if (isquote(tmplLine->elements[j].item[itemlen - 1])) {
2964     c = malloc(quoteLen + 1);
2965     c[0] = '\0';
2966     for (int i = firstQuotedItem; i < j+1; i++) {
2967        strcat(c, tmplLine->elements[i].item);
2968        strcat(c, tmplLine->elements[i].indent);
2969     }
2970     insertElement(&newLine, c, element++, cfi);
2971     free(c);
2972    
2973     firstQuotedItem = -1;
2974     quoteLen = 0;
2975        }
2976     }
2977        }
2978        while (tmplLine->numElements)
2979     removeElement(tmplLine, 0);
2980        if (tmplLine->elements)
2981     free(tmplLine->elements);
2982    
2983        tmplLine->numElements = newLine.numElements;
2984        tmplLine->elements = newLine.elements;
2985    }
2986    
2987    static void insertElement(struct singleLine * line,
2988      const char * item, int insertHere,
2989      struct configFileInfo * cfi)
2990    {
2991        struct keywordTypes * kw;
2992        char indent[2] = "";
2993    
2994        /* sanity check */
2995        if (insertHere > line->numElements) {
2996     dbgPrintf("insertElement() adjusting insertHere from %d to %d\n",
2997      insertHere, line->numElements);
2998     insertHere = line->numElements;
2999        }
3000    
3001        line->elements = realloc(line->elements, (line->numElements + 1) *
3002         sizeof(*line->elements));
3003        memmove(&line->elements[insertHere+1],
3004        &line->elements[insertHere],
3005        (line->numElements - insertHere) *
3006        sizeof(*line->elements));
3007        line->elements[insertHere].item = strdup(item);
3008    
3009        kw = getKeywordByType(line->type, cfi);
3010    
3011        if (line->numElements == 0) {
3012     indent[0] = '\0';
3013        } else if (insertHere == 0) {
3014     indent[0] = kw->nextChar;
3015        } else if (kw->separatorChar != '\0') {
3016     indent[0] = kw->separatorChar;
3017        } else {
3018     indent[0] = ' ';
3019        }
3020    
3021        if (insertHere > 0 && line->elements[insertHere-1].indent[0] == '\0') {
3022     /* move the end-of-line forward */
3023     line->elements[insertHere].indent =
3024        line->elements[insertHere-1].indent;
3025     line->elements[insertHere-1].indent = strdup(indent);
3026        } else {
3027     line->elements[insertHere].indent = strdup(indent);
3028        }
3029    
3030        line->numElements++;
3031    
3032        dbgPrintf("insertElement(%s, '%s%s', %d)\n",
3033          line->elements[0].item,
3034          line->elements[insertHere].item,
3035          line->elements[insertHere].indent,
3036          insertHere);
3037    }
3038    
3039    static void removeElement(struct singleLine * line, int removeHere) {
3040        int i;
3041    
3042        /* sanity check */
3043        if (removeHere >= line->numElements) return;
3044    
3045        dbgPrintf("removeElement(%s, %d:%s)\n", line->elements[0].item,
3046          removeHere, line->elements[removeHere].item);
3047    
3048        free(line->elements[removeHere].item);
3049    
3050        if (removeHere > 1) {
3051     /* previous argument gets this argument's post-indentation */
3052     free(line->elements[removeHere-1].indent);
3053     line->elements[removeHere-1].indent =
3054        line->elements[removeHere].indent;
3055        } else {
3056     free(line->elements[removeHere].indent);
3057        }
3058    
3059        /* now collapse the array, but don't bother to realloc smaller */
3060        for (i = removeHere; i < line->numElements - 1; i++)
3061     line->elements[i] = line->elements[i + 1];
3062    
3063        line->numElements--;
3064    }
3065    
3066  int argMatch(const char * one, const char * two) {  int argMatch(const char * one, const char * two) {
3067      char * first, * second;      char * first, * second;
3068      char * chptr;      char * chptr;
# Line 1575  int updateActualImage(struct grubConfig Line 3085  int updateActualImage(struct grubConfig
3085      struct singleEntry * entry;      struct singleEntry * entry;
3086      struct singleLine * line, * rootLine;      struct singleLine * line, * rootLine;
3087      int index = 0;      int index = 0;
3088      int i, j, k;      int i, k;
3089      const char ** newArgs, ** oldArgs;      const char ** newArgs, ** oldArgs;
3090      const char ** arg;      const char ** arg;
3091      const char * chptr;      int useKernelArgs, useRoot;
     int useKernelArgs = 0;  
     int useRoot = 0;  
3092      int firstElement;      int firstElement;
3093      int *usedElements, *usedArgs;      int *usedElements;
3094        int doreplace;
3095    
3096      if (!image) return 0;      if (!image) return 0;
3097    
# Line 1609  int updateActualImage(struct grubConfig Line 3118  int updateActualImage(struct grubConfig
3118   }   }
3119      }      }
3120    
     for (i = 0; cfg->cfi->keywords[i].key; i++)  
  if (cfg->cfi->keywords[i].type == LT_KERNELARGS) break;  
   
     if (cfg->cfi->keywords[i].key)  
  useKernelArgs = 1;  
3121    
3122      for (i = 0; cfg->cfi->keywords[i].key; i++)      useKernelArgs = (getKeywordByType(LT_KERNELARGS, cfg->cfi)
3123   if (cfg->cfi->keywords[i].type == LT_ROOT) break;       && (!multibootArgs || cfg->cfi->mbConcatArgs));
3124    
3125      if (cfg->cfi->keywords[i].key)      useRoot = (getKeywordByType(LT_ROOT, cfg->cfi)
3126   useRoot = 1;         && !multibootArgs);
3127    
3128      k = 0;      for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
     for (arg = newArgs; *arg; arg++)  
         k++;  
     usedArgs = calloc(k, sizeof(int));  
   
     while ((entry = findEntryByPath(cfg, image, prefix, &index))) {  
  index++;  
3129    
3130   line = entry->lines;   if (multibootArgs && !entry->multiboot)
3131   while (line && line->type != LT_KERNEL) line = line->next;      continue;
3132   if (!line) continue;  
3133   firstElement = 2;   /* Determine where to put the args.  If this config supports
3134     * LT_KERNELARGS, use that.  Otherwise use
3135          if (entry->multiboot && !multibootArgs) {   * LT_HYPER/LT_KERNEL/LT_MBMODULE lines.
3136              /* first mb module line is the real kernel */   */
3137              while (line && line->type != LT_MBMODULE) line = line->next;   if (useKernelArgs) {
3138              firstElement = 2;      line = getLineByType(LT_KERNELARGS, entry->lines);
3139          } else if (useKernelArgs) {      if (!line) {
3140      while (line && line->type != LT_KERNELARGS) line = line->next;   /* no LT_KERNELARGS, need to add it */
3141     line = addLine(entry, cfg->cfi, LT_KERNELARGS,
3142           cfg->secondaryIndent, NULL);
3143        }
3144      firstElement = 1;      firstElement = 1;
3145    
3146     } else if (multibootArgs) {
3147        line = getLineByType(LT_HYPER, entry->lines);
3148        if (!line) {
3149     /* a multiboot entry without LT_HYPER? */
3150     continue;
3151        }
3152        firstElement = 2;
3153    
3154     } else {
3155        line = getLineByType(LT_KERNEL|LT_MBMODULE|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
3156        if (!line) {
3157     /* no LT_KERNEL or LT_MBMODULE in this entry? */
3158     continue;
3159        }
3160        firstElement = 2;
3161   }   }
3162    
3163   if (!line && useKernelArgs) {   /* handle the elilo case which does:
3164      /* no append in there, need to add it */   *   append="hypervisor args -- kernel args"
3165      line = addLine(entry, cfg->cfi, LT_KERNELARGS, NULL, NULL);   */
3166     if (entry->multiboot && cfg->cfi->mbConcatArgs) {
3167        /* this is a multiboot entry, make sure there's
3168         * -- on the args line
3169         */
3170        for (i = firstElement; i < line->numElements; i++) {
3171     if (!strcmp(line->elements[i].item, "--"))
3172        break;
3173        }
3174        if (i == line->numElements) {
3175     /* assume all existing args are kernel args,
3176     * prepend -- to make it official
3177     */
3178     insertElement(line, "--", firstElement, cfg->cfi);
3179     i = firstElement;
3180        }
3181        if (!multibootArgs) {
3182     /* kernel args start after the -- */
3183     firstElement = i + 1;
3184        }
3185     } else if (cfg->cfi->mbConcatArgs) {
3186        /* this is a non-multiboot entry, remove hyper args */
3187        for (i = firstElement; i < line->numElements; i++) {
3188     if (!strcmp(line->elements[i].item, "--"))
3189        break;
3190        }
3191        if (i < line->numElements) {
3192     /* remove args up to -- */
3193     while (strcmp(line->elements[firstElement].item, "--"))
3194        removeElement(line, firstElement);
3195     /* remove -- */
3196     removeElement(line, firstElement);
3197        }
3198   }   }
3199    
3200          usedElements = calloc(line->numElements, sizeof(int));          usedElements = calloc(line->numElements, sizeof(*usedElements));
3201    
3202          k = 0;   for (k = 0, arg = newArgs; *arg; arg++, k++) {
3203   for (arg = newArgs; *arg; arg++) {  
3204              if (usedArgs[k]) {      doreplace = 1;
                 k++;  
                 continue;  
             }  
3205      for (i = firstElement; i < line->numElements; i++) {      for (i = firstElement; i < line->numElements; i++) {
3206     if (multibootArgs && cfg->cfi->mbConcatArgs &&
3207        !strcmp(line->elements[i].item, "--"))
3208     {
3209        /* reached the end of hyper args, insert here */
3210        doreplace = 0;
3211        break;  
3212     }
3213                  if (usedElements[i])                  if (usedElements[i])
3214                      continue;                      continue;
3215   if (!argMatch(line->elements[i].item, *arg)) {   if (!argMatch(line->elements[i].item, *arg)) {
3216                      usedElements[i]=1;                      usedElements[i]=1;
                     usedArgs[k]=1;  
3217      break;      break;
3218                  }                  }
3219              }              }
     chptr = strchr(*arg, '=');  
3220    
3221      if (i < line->numElements) {      if (i < line->numElements && doreplace) {
3222   /* replace */   /* direct replacement */
3223   free(line->elements[i].item);   free(line->elements[i].item);
3224   line->elements[i].item = strdup(*arg);   line->elements[i].item = strdup(*arg);
     } else if (useRoot && !strncmp(*arg, "root=/dev/", 10) && *chptr) {  
  rootLine = entry->lines;  
  while (rootLine && rootLine->type != LT_ROOT)  
     rootLine = rootLine->next;  
  if (!rootLine) {  
     rootLine = addLine(entry, cfg->cfi, LT_ROOT, NULL, NULL);  
     rootLine->elements = realloc(rootLine->elements,  
     2 * sizeof(*rootLine->elements));  
     rootLine->numElements++;  
     rootLine->elements[1].indent = strdup("");  
     rootLine->elements[1].item = strdup("");  
  }  
3225    
3226   free(rootLine->elements[1].item);      } else if (useRoot && !strncmp(*arg, "root=/dev/", 10)) {
3227   rootLine->elements[1].item = strdup(chptr + 1);   /* root= replacement */
3228      } else {   rootLine = getLineByType(LT_ROOT, entry->lines);
3229   /* append */   if (rootLine) {
3230   line->elements = realloc(line->elements,      free(rootLine->elements[1].item);
3231   (line->numElements + 1) * sizeof(*line->elements));      rootLine->elements[1].item = strdup(*arg + 5);
  line->elements[line->numElements].item = strdup(*arg);  
  usedElements = realloc(usedElements,  
  (line->numElements + 1) * sizeof(int));  
  usedElements[line->numElements] = 1;  
   
  if (line->numElements > 1) {  
     /* add to existing list of arguments */  
     line->elements[line->numElements].indent =  
  line->elements[line->numElements - 1].indent;  
     line->elements[line->numElements - 1].indent = strdup(" ");  
3232   } else {   } else {
3233      /* First thing on this line; treat a bit differently. Note      rootLine = addLine(entry, cfg->cfi, LT_ROOT,
3234         this is only possible if we've added a LT_KERNELARGS         cfg->secondaryIndent, *arg + 5);
        entry */  
     line->elements[line->numElements].indent = strdup("");  
3235   }   }
3236        }
3237    
3238   line->numElements++;      else {
3239     /* insert/append */
3240     insertElement(line, *arg, i, cfg->cfi);
3241     usedElements = realloc(usedElements, line->numElements *
3242           sizeof(*usedElements));
3243     memmove(&usedElements[i + 1], &usedElements[i],
3244     line->numElements - i - 1);
3245     usedElements[i] = 1;
3246    
3247   /* if we updated a root= here even though there is a   /* if we updated a root= here even though there is a
3248     LT_ROOT available we need to remove the LT_ROOT entry     LT_ROOT available we need to remove the LT_ROOT entry
3249     (this will happen if we switch from a device to a label) */     (this will happen if we switch from a device to a label) */
3250   if (useRoot && !strncmp(*arg, "root=", 5)) {   if (useRoot && !strncmp(*arg, "root=", 5)) {
3251      rootLine = entry->lines;      rootLine = getLineByType(LT_ROOT, entry->lines);
3252      while (rootLine && rootLine->type != LT_ROOT)      if (rootLine)
  rootLine = rootLine->next;  
     if (rootLine) {  
3253   removeLine(entry, rootLine);   removeLine(entry, rootLine);
     }  
3254   }   }
3255      }      }
             k++;  
3256   }   }
3257    
3258          free(usedElements);          free(usedElements);
3259    
  /* no arguments to remove (i.e. no append line) */  
  if (!line) continue;  
   
  /* this won't remove an LT_ROOT item properly (but then again,  
    who cares? */  
3260   for (arg = oldArgs; *arg; arg++) {   for (arg = oldArgs; *arg; arg++) {
3261      for (i = firstElement; i < line->numElements; i++)      for (i = firstElement; i < line->numElements; i++) {
3262   if (!argMatch(line->elements[i].item, *arg))   if (multibootArgs && cfg->cfi->mbConcatArgs &&
3263        !strcmp(line->elements[i].item, "--"))
3264        /* reached the end of hyper args, stop here */
3265        break;
3266     if (!argMatch(line->elements[i].item, *arg)) {
3267        removeElement(line, i);
3268      break;      break;
   
     if (i < line->numElements) {  
  /* if this isn't the first argument the previous argument  
    gets this arguments post-indention */  
  if (i > firstElement) {  
     free(line->elements[i - 1].indent);  
     line->elements[i - 1].indent = line->elements[i].indent;  
3269   }   }
3270        }
3271   free(line->elements[i].item);      /* handle removing LT_ROOT line too */
3272        if (useRoot && !strncmp(*arg, "root=", 5)) {
3273   for (j = i + 1; j < line->numElements; j++)   rootLine = getLineByType(LT_ROOT, entry->lines);
3274      line->elements[j - 1] = line->elements[j];   if (rootLine)
3275        removeLine(entry, rootLine);
  line->numElements--;  
3276      }      }
3277   }   }
3278    
# Line 1760  int updateActualImage(struct grubConfig Line 3283  int updateActualImage(struct grubConfig
3283   }   }
3284      }      }
3285    
     free(usedArgs);  
3286      free(newArgs);      free(newArgs);
3287      free(oldArgs);      free(oldArgs);
3288    
# Line 1786  int updateImage(struct grubConfig * cfg, Line 3308  int updateImage(struct grubConfig * cfg,
3308      return rc;      return rc;
3309  }  }
3310    
3311    int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
3312     const char * image, const char * prefix, const char * initrd) {
3313        struct singleEntry * entry;
3314        struct singleLine * line, * kernelLine, *endLine = NULL;
3315        int index = 0;
3316    
3317        if (!image) return 0;
3318    
3319        for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
3320            kernelLine = getLineByType(LT_MBMODULE, entry->lines);
3321            if (!kernelLine) continue;
3322    
3323            if (prefix) {
3324                int prefixLen = strlen(prefix);
3325                if (!strncmp(initrd, prefix, prefixLen))
3326                    initrd += prefixLen;
3327            }
3328     endLine = getLineByType(LT_ENTRY_END, entry->lines);
3329     if (endLine)
3330        removeLine(entry, endLine);
3331            line = addLine(entry, cfg->cfi, preferredLineType(LT_MBMODULE,cfg->cfi),
3332     kernelLine->indent, initrd);
3333            if (!line)
3334        return 1;
3335     if (endLine) {
3336        line = addLine(entry, cfg->cfi, LT_ENTRY_END, "", NULL);
3337                if (!line)
3338     return 1;
3339     }
3340    
3341            break;
3342        }
3343    
3344        return 0;
3345    }
3346    
3347    int updateInitrd(struct grubConfig * cfg, const char * image,
3348                     const char * prefix, const char * initrd) {
3349        struct singleEntry * entry;
3350        struct singleLine * line, * kernelLine, *endLine = NULL;
3351        int index = 0;
3352    
3353        if (!image) return 0;
3354    
3355        for (; (entry = findEntryByPath(cfg, image, prefix, &index)); index++) {
3356            kernelLine = getLineByType(LT_KERNEL|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
3357            if (!kernelLine) continue;
3358    
3359            line = getLineByType(LT_INITRD|LT_INITRD_EFI|LT_INITRD_16, entry->lines);
3360            if (line)
3361                removeLine(entry, line);
3362            if (prefix) {
3363                int prefixLen = strlen(prefix);
3364                if (!strncmp(initrd, prefix, prefixLen))
3365                    initrd += prefixLen;
3366            }
3367     endLine = getLineByType(LT_ENTRY_END, entry->lines);
3368     if (endLine)
3369        removeLine(entry, endLine);
3370     enum lineType_e lt;
3371     switch(kernelLine->type) {
3372        case LT_KERNEL:
3373            lt = LT_INITRD;
3374     break;
3375        case LT_KERNEL_EFI:
3376            lt = LT_INITRD_EFI;
3377     break;
3378        case LT_KERNEL_16:
3379            lt = LT_INITRD_16;
3380     break;
3381        default:
3382            lt = preferredLineType(LT_INITRD, cfg->cfi);
3383     }
3384            line = addLine(entry, cfg->cfi, lt, kernelLine->indent, initrd);
3385            if (!line)
3386        return 1;
3387     if (endLine) {
3388        line = addLine(entry, cfg->cfi, LT_ENTRY_END, "", NULL);
3389                if (!line)
3390     return 1;
3391     }
3392    
3393            break;
3394        }
3395    
3396        return 0;
3397    }
3398    
3399  int checkDeviceBootloader(const char * device, const unsigned char * boot) {  int checkDeviceBootloader(const char * device, const unsigned char * boot) {
3400      int fd;      int fd;
3401      unsigned char bootSect[512];      unsigned char bootSect[512];
# Line 1809  int checkDeviceBootloader(const char * d Line 3419  int checkDeviceBootloader(const char * d
3419      if (memcmp(boot, bootSect, 3))      if (memcmp(boot, bootSect, 3))
3420   return 0;   return 0;
3421    
3422      if (boot[1] == 0xeb) {      if (boot[1] == JMP_SHORT_OPCODE) {
3423   offset = boot[2] + 2;   offset = boot[2] + 2;
3424      } else if (boot[1] == 0xe8 || boot[1] == 0xe9) {      } else if (boot[1] == 0xe8 || boot[1] == 0xe9) {
3425   offset = (boot[3] << 8) + boot[2] + 2;   offset = (boot[3] << 8) + boot[2] + 2;
3426      } else if (boot[0] == 0xeb) {      } else if (boot[0] == JMP_SHORT_OPCODE) {
3427   offset = boot[1] + 2;        offset = boot[1] + 2;
3428            /*
3429     * it looks like grub, when copying stage1 into the mbr, patches stage1
3430     * right after the JMP location, replacing other instructions such as
3431     * JMPs for NOOPs. So, relax the check a little bit by skipping those
3432     * different bytes.
3433     */
3434          if ((bootSect[offset + 1] == NOOP_OPCODE)
3435      && (bootSect[offset + 2] == NOOP_OPCODE)) {
3436     offset = offset + 3;
3437          }
3438      } else if (boot[0] == 0xe8 || boot[0] == 0xe9) {      } else if (boot[0] == 0xe8 || boot[0] == 0xe9) {
3439   offset = (boot[2] << 8) + boot[1] + 2;   offset = (boot[2] << 8) + boot[1] + 2;
3440      } else {      } else {
# Line 1956  int checkForLilo(struct grubConfig * con Line 3576  int checkForLilo(struct grubConfig * con
3576      return checkDeviceBootloader(line->elements[1].item, boot);      return checkDeviceBootloader(line->elements[1].item, boot);
3577  }  }
3578    
3579    int checkForGrub2(struct grubConfig * config) {
3580        if (!access("/etc/grub.d/", R_OK))
3581     return 2;
3582    
3583        return 1;
3584    }
3585    
3586  int checkForGrub(struct grubConfig * config) {  int checkForGrub(struct grubConfig * config) {
3587      int fd;      int fd;
3588      unsigned char bootSect[512];      unsigned char bootSect[512];
3589      char * boot;      char * boot;
3590        int onSuse = isSuseSystem();
3591    
3592      if (parseSysconfigGrub(NULL, &boot))  
3593   return 0;      if (onSuse) {
3594     if (parseSuseGrubConf(NULL, &boot))
3595        return 0;
3596        } else {
3597     if (parseSysconfigGrub(NULL, &boot))
3598        return 0;
3599        }
3600    
3601      /* assume grub is not installed -- not an error condition */      /* assume grub is not installed -- not an error condition */
3602      if (!boot)      if (!boot)
# Line 1976  int checkForGrub(struct grubConfig * con Line 3610  int checkForGrub(struct grubConfig * con
3610      if (read(fd, bootSect, 512) != 512) {      if (read(fd, bootSect, 512) != 512) {
3611   fprintf(stderr, _("grubby: unable to read %s: %s\n"),   fprintf(stderr, _("grubby: unable to read %s: %s\n"),
3612   "/boot/grub/stage1", strerror(errno));   "/boot/grub/stage1", strerror(errno));
3613     close(fd);
3614     return 1;
3615        }
3616        close(fd);
3617    
3618        /* The more elaborate checks do not work on SuSE. The checks done
3619         * seem to be reasonble (at least for now), so just return success
3620         */
3621        if (onSuse)
3622     return 2;
3623    
3624        return checkDeviceBootloader(boot, bootSect);
3625    }
3626    
3627    int checkForExtLinux(struct grubConfig * config) {
3628        int fd;
3629        unsigned char bootSect[512];
3630        char * boot;
3631        char executable[] = "/boot/extlinux/extlinux";
3632    
3633        printf("entered: checkForExtLinux()\n");
3634    
3635        if (parseSysconfigGrub(NULL, &boot))
3636     return 0;
3637    
3638        /* assume grub is not installed -- not an error condition */
3639        if (!boot)
3640     return 0;
3641    
3642        fd = open(executable, O_RDONLY);
3643        if (fd < 0)
3644     /* this doesn't exist if grub hasn't been installed */
3645     return 0;
3646    
3647        if (read(fd, bootSect, 512) != 512) {
3648     fprintf(stderr, _("grubby: unable to read %s: %s\n"),
3649     executable, strerror(errno));
3650   return 1;   return 1;
3651      }      }
3652      close(fd);      close(fd);
# Line 1983  int checkForGrub(struct grubConfig * con Line 3654  int checkForGrub(struct grubConfig * con
3654      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
3655  }  }
3656    
3657    int checkForYaboot(struct grubConfig * config) {
3658        /*
3659         * This is a simplistic check that we consider good enough for own puporses
3660         *
3661         * If we were to properly check if yaboot is *installed* we'd need to:
3662         * 1) get the system boot device (LT_BOOT)
3663         * 2) considering it's a raw filesystem, check if the yaboot binary matches
3664         *    the content on the boot device
3665         * 3) if not, copy the binary to a temporary file and run "addnote" on it
3666         * 4) check again if binary and boot device contents match
3667         */
3668        if (!access("/etc/yaboot.conf", R_OK))
3669     return 2;
3670    
3671        return 1;
3672    }
3673    
3674    int checkForElilo(struct grubConfig * config) {
3675        if (!access("/etc/elilo.conf", R_OK))
3676     return 2;
3677    
3678        return 1;
3679    }
3680    
3681  static char * getRootSpecifier(char * str) {  static char * getRootSpecifier(char * str) {
3682      char * idx, * rootspec = NULL;      char * idx, * rootspec = NULL;
3683    
# Line 1994  static char * getRootSpecifier(char * st Line 3689  static char * getRootSpecifier(char * st
3689      return rootspec;      return rootspec;
3690  }  }
3691    
3692    static char * getInitrdVal(struct grubConfig * config,
3693       const char * prefix, struct singleLine *tmplLine,
3694       const char * newKernelInitrd,
3695       const char ** extraInitrds, int extraInitrdCount)
3696    {
3697        char *initrdVal, *end;
3698        int i;
3699        size_t totalSize;
3700        size_t prefixLen;
3701        char separatorChar;
3702    
3703        prefixLen = strlen(prefix);
3704        totalSize = strlen(newKernelInitrd) - prefixLen + 1 /* \0 */;
3705    
3706        for (i = 0; i < extraInitrdCount; i++) {
3707     totalSize += sizeof(separatorChar);
3708     totalSize += strlen(extraInitrds[i]) - prefixLen;
3709        }
3710    
3711        initrdVal = end = malloc(totalSize);
3712    
3713        end = stpcpy (end, newKernelInitrd + prefixLen);
3714    
3715        separatorChar = getKeywordByType(LT_INITRD, config->cfi)->separatorChar;
3716        for (i = 0; i < extraInitrdCount; i++) {
3717     const char *extraInitrd;
3718     int j;
3719    
3720     extraInitrd = extraInitrds[i] + prefixLen;
3721     /* Don't add entries that are already there */
3722     if (tmplLine != NULL) {
3723        for (j = 2; j < tmplLine->numElements; j++)
3724     if (strcmp(extraInitrd, tmplLine->elements[j].item) == 0)
3725        break;
3726    
3727        if (j != tmplLine->numElements)
3728     continue;
3729     }
3730    
3731     *end++ = separatorChar;
3732     end = stpcpy(end, extraInitrd);
3733        }
3734    
3735        return initrdVal;
3736    }
3737    
3738  int addNewKernel(struct grubConfig * config, struct singleEntry * template,  int addNewKernel(struct grubConfig * config, struct singleEntry * template,
3739           const char * prefix,           const char * prefix,
3740   char * newKernelPath, char * newKernelTitle,   const char * newKernelPath, const char * newKernelTitle,
3741   char * newKernelArgs, char * newKernelInitrd,   const char * newKernelArgs, const char * newKernelInitrd,
3742                   char * newMBKernel, char * newMBKernelArgs) {   const char ** extraInitrds, int extraInitrdCount,
3743                     const char * newMBKernel, const char * newMBKernelArgs,
3744     const char * newDevTreePath) {
3745      struct singleEntry * new;      struct singleEntry * new;
3746      struct singleLine * newLine = NULL, * tmplLine = NULL, * lastLine = NULL;      struct singleLine * newLine = NULL, * tmplLine = NULL, * masterLine = NULL;
3747      int needs;      int needs;
     char * indent = NULL;  
     char * rootspec = NULL;  
3748      char * chptr;      char * chptr;
     int i;  
     enum lineType_e type;  
3749    
3750      if (!newKernelPath) return 0;      if (!newKernelPath) return 0;
3751    
# Line 2036  int addNewKernel(struct grubConfig * con Line 3775  int addNewKernel(struct grubConfig * con
3775      config->entries = new;      config->entries = new;
3776    
3777      /* copy/update from the template */      /* copy/update from the template */
3778      needs = KERNEL_KERNEL | KERNEL_INITRD | KERNEL_TITLE;      needs = NEED_KERNEL | NEED_TITLE;
3779        if (newKernelInitrd)
3780     needs |= NEED_INITRD;
3781      if (newMBKernel) {      if (newMBKernel) {
3782          needs |= KERNEL_MB;          needs |= NEED_MB;
3783          new->multiboot = 1;          new->multiboot = 1;
3784      }      }
3785        if (newDevTreePath && getKeywordByType(LT_DEVTREE, config->cfi))
3786     needs |= NEED_DEVTREE;
3787    
3788      if (template) {      if (template) {
3789   for (tmplLine = template->lines; tmplLine; tmplLine = tmplLine->next) {   for (masterLine = template->lines;
3790      /* remember the indention level; we may need it for new lines */       masterLine && (tmplLine = lineDup(masterLine));
3791      if (tmplLine->numElements)       lineFree(tmplLine), masterLine = masterLine->next)
3792   indent = tmplLine->indent;   {
3793        dbgPrintf("addNewKernel processing %d\n", tmplLine->type);
3794    
3795      /* skip comments */      /* skip comments */
3796      chptr = tmplLine->indent;      chptr = tmplLine->indent;
3797      while (*chptr && isspace(*chptr)) chptr++;      while (*chptr && isspace(*chptr)) chptr++;
3798      if (*chptr == '#') continue;      if (*chptr == '#') continue;
3799    
3800      /* we don't need an initrd here */      if (iskernel(tmplLine->type) && tmplLine->numElements >= 2) {
3801      if (tmplLine->type == LT_INITRD && !newKernelInitrd) continue;   if (!template->multiboot && (needs & NEED_MB)) {
3802        /* it's not a multiboot template and this is the kernel
3803              if (tmplLine->type == LT_KERNEL &&       * line.  Try to be intelligent about inserting the
3804                  !template->multiboot && (needs & KERNEL_MB)) {       * hypervisor at the same time.
3805                  struct singleLine *l;       */
3806                  needs &= ~ KERNEL_MB;      if (config->cfi->mbHyperFirst) {
3807     /* insert the hypervisor first */
3808                  l = addLine(new, config->cfi, LT_KERNEL,   newLine = addLine(new, config->cfi, LT_HYPER,
3809                                    config->secondaryIndent,    tmplLine->indent,
3810                                    newMBKernel + strlen(prefix));    newMBKernel + strlen(prefix));
3811                     /* set up for adding the kernel line */
3812                  tmplLine = lastLine;   free(tmplLine->indent);
3813                  if (!new->lines) {   tmplLine->indent = strdup(config->secondaryIndent);
3814                      new->lines = l;   needs &= ~NEED_MB;
3815                  } else {      }
3816                      newLine->next = l;      if (needs & NEED_KERNEL) {
3817                      newLine = l;   /* use addLineTmpl to preserve line elements,
3818                  }   * otherwise we could just call addLine.  Unfortunately
3819                  continue;   * this means making some changes to the template
3820              } else if (tmplLine->type == LT_KERNEL &&   * such as the indent change above and the type
3821                         template->multiboot && !new->multiboot) {   * change below.
3822                  continue; /* don't need multiboot kernel here */   */
3823              }   struct keywordTypes * mbm_kw =
3824        getKeywordByType(LT_MBMODULE, config->cfi);
3825      if (!new->lines) {   if (mbm_kw) {
3826   newLine = malloc(sizeof(*newLine));      tmplLine->type = LT_MBMODULE;
3827   new->lines = newLine;      free(tmplLine->elements[0].item);
3828      } else {      tmplLine->elements[0].item = strdup(mbm_kw->key);
3829   newLine->next = malloc(sizeof(*newLine));   }
3830   newLine = newLine->next;   newLine = addLineTmpl(new, tmplLine, newLine,
3831      }        newKernelPath + strlen(prefix), config->cfi);
3832     needs &= ~NEED_KERNEL;
3833        }
3834        if (needs & NEED_MB) { /* !mbHyperFirst */
3835     newLine = addLine(new, config->cfi, LT_HYPER,
3836      config->secondaryIndent,
3837      newMBKernel + strlen(prefix));
3838     needs &= ~NEED_MB;
3839        }
3840     } else if (needs & NEED_KERNEL) {
3841        newLine = addLineTmpl(new, tmplLine, newLine,
3842      newKernelPath + strlen(prefix), config->cfi);
3843        needs &= ~NEED_KERNEL;
3844     }
3845    
3846        } else if (tmplLine->type == LT_HYPER &&
3847           tmplLine->numElements >= 2) {
3848     if (needs & NEED_MB) {
3849        newLine = addLineTmpl(new, tmplLine, newLine,
3850      newMBKernel + strlen(prefix), config->cfi);
3851        needs &= ~NEED_MB;
3852     }
3853    
3854      newLine->indent = strdup(tmplLine->indent);      } else if (tmplLine->type == LT_MBMODULE &&
3855      newLine->next = NULL;         tmplLine->numElements >= 2) {
3856      newLine->type = tmplLine->type;   if (new->multiboot) {
3857      newLine->numElements = tmplLine->numElements;      if (needs & NEED_KERNEL) {
3858      newLine->elements = malloc(sizeof(*newLine->elements) *   newLine = addLineTmpl(new, tmplLine, newLine,
3859      newLine->numElements);        newKernelPath +
3860      for (i = 0; i < newLine->numElements; i++) {        strlen(prefix), config->cfi);
3861   newLine->elements[i].item = strdup(tmplLine->elements[i].item);   needs &= ~NEED_KERNEL;
3862   newLine->elements[i].indent =      } else if (config->cfi->mbInitRdIsModule &&
3863   strdup(tmplLine->elements[i].indent);         (needs & NEED_INITRD)) {
3864      }   char *initrdVal;
3865     initrdVal = getInitrdVal(config, prefix, tmplLine,
3866              lastLine = tmplLine;   newKernelInitrd, extraInitrds,
3867      if (tmplLine->type == LT_KERNEL && tmplLine->numElements >= 2) {   extraInitrdCount);
3868                  char * repl;   newLine = addLineTmpl(new, tmplLine, newLine,
3869                  if (!template->multiboot) {        initrdVal, config->cfi);
3870                      needs &= ~KERNEL_KERNEL;   free(initrdVal);
3871                      repl = newKernelPath;   needs &= ~NEED_INITRD;
3872                  } else {      }
3873                      needs &= ~KERNEL_MB;   } else if (needs & NEED_KERNEL) {
3874                      repl = newMBKernel;      /* template is multi but new is not,
3875                  }       * insert the kernel in the first module slot
3876                  if (new->multiboot && !template->multiboot) {       */
3877                      free(newLine->elements[0].item);      tmplLine->type = preferredLineType(LT_KERNEL, config->cfi);
3878                      newLine->elements[0].item = strdup("module");      free(tmplLine->elements[0].item);
3879                      newLine->type = LT_MBMODULE;      tmplLine->elements[0].item =
3880                  }   strdup(getKeywordByType(tmplLine->type,
3881   free(newLine->elements[1].item);   config->cfi)->key);
3882                  rootspec = getRootSpecifier(tmplLine->elements[1].item);      newLine = addLineTmpl(new, tmplLine, newLine,
3883                  if (rootspec != NULL) {    newKernelPath + strlen(prefix),
3884                      newLine->elements[1].item = sdupprintf("%s%s",    config->cfi);
3885                                                             rootspec,      needs &= ~NEED_KERNEL;
3886                                                             repl +   } else if (needs & NEED_INITRD) {
3887                                                             strlen(prefix));      char *initrdVal;
3888                  } else {      /* template is multi but new is not,
3889                      newLine->elements[1].item = strdup(repl +       * insert the initrd in the second module slot
3890                                                         strlen(prefix));       */
3891                  }      tmplLine->type = preferredLineType(LT_INITRD, config->cfi);
3892              } else if (tmplLine->type == LT_MBMODULE &&      free(tmplLine->elements[0].item);
3893                         tmplLine->numElements >= 2 && (needs & KERNEL_KERNEL)) {      tmplLine->elements[0].item =
3894                  needs &= ~KERNEL_KERNEL;   strdup(getKeywordByType(tmplLine->type,
3895                  if (!new->multiboot && template->multiboot) {   config->cfi)->key);
3896                      free(newLine->elements[0].item);      initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);
3897                      newLine->elements[0].item = strdup("kernel");      newLine = addLineTmpl(new, tmplLine, newLine, initrdVal, config->cfi);
3898                      newLine->type = LT_KERNEL;      free(initrdVal);
3899                  }      needs &= ~NEED_INITRD;
3900   free(newLine->elements[1].item);   }
                 rootspec = getRootSpecifier(tmplLine->elements[1].item);  
                 if (rootspec != NULL) {  
                     newLine->elements[1].item = sdupprintf("%s%s",  
                                                            rootspec,  
                                                            newKernelPath +  
                                                            strlen(prefix));  
                 } else {  
                     newLine->elements[1].item = strdup(newKernelPath +  
                                                        strlen(prefix));  
                 }  
     } else if (tmplLine->type == LT_INITRD &&  
     tmplLine->numElements >= 2) {  
  needs &= ~KERNEL_INITRD;  
  free(newLine->elements[1].item);  
                 if (new->multiboot && !template->multiboot) {  
                     free(newLine->elements[0].item);  
                     newLine->elements[0].item = strdup("module");  
                     newLine->type = LT_MBMODULE;  
                 }  
                 rootspec = getRootSpecifier(tmplLine->elements[1].item);  
                 if (rootspec != NULL) {  
                     newLine->elements[1].item = sdupprintf("%s%s",  
                                                            rootspec,  
                                                            newKernelInitrd +  
                                                            strlen(prefix));  
                 } else {  
                     newLine->elements[1].item = strdup(newKernelInitrd +  
                                                        strlen(prefix));  
                 }  
             } else if (tmplLine->type == LT_MBMODULE &&  
                        tmplLine->numElements >= 2 && (needs & KERNEL_INITRD)) {  
  needs &= ~KERNEL_INITRD;  
                 if (!new->multiboot && template->multiboot) {  
                     free(newLine->elements[0].item);  
                     newLine->elements[0].item = strdup("initrd");  
                     newLine->type = LT_INITRD;  
                 }  
  free(newLine->elements[1].item);  
                 rootspec = getRootSpecifier(tmplLine->elements[1].item);  
                 if (rootspec != NULL) {  
                     newLine->elements[1].item = sdupprintf("%s%s",  
                                                            rootspec,  
                                                            newKernelInitrd +  
                                                            strlen(prefix));  
                 } else {  
                     newLine->elements[1].item = strdup(newKernelInitrd +  
                                                        strlen(prefix));  
                 }  
     } else if (tmplLine->type == LT_TITLE &&  
     tmplLine->numElements >= 2) {  
  needs &= ~KERNEL_TITLE;  
3901    
3902   for (i = 1; i < newLine->numElements; i++) {      } else if (isinitrd(tmplLine->type) && tmplLine->numElements >= 2) {
3903      free(newLine->elements[i].item);   if (needs & NEED_INITRD &&
3904      free(newLine->elements[i].indent);      new->multiboot && !template->multiboot &&
3905        config->cfi->mbInitRdIsModule) {
3906        /* make sure we don't insert the module initrd
3907         * before the module kernel... if we don't do it here,
3908         * it will be inserted following the template.
3909         */
3910        if (!needs & NEED_KERNEL) {
3911     char *initrdVal;
3912    
3913     initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);
3914     newLine = addLine(new, config->cfi, LT_MBMODULE,
3915      config->secondaryIndent,
3916      initrdVal);
3917     free(initrdVal);
3918     needs &= ~NEED_INITRD;
3919        }
3920     } else if (needs & NEED_INITRD) {
3921        char *initrdVal;
3922        initrdVal = getInitrdVal(config, prefix, tmplLine, newKernelInitrd, extraInitrds, extraInitrdCount);
3923        newLine = addLineTmpl(new, tmplLine, newLine, initrdVal, config->cfi);
3924        free(initrdVal);
3925        needs &= ~NEED_INITRD;
3926   }   }
3927    
3928   newLine->elements[1].item = strdup(newKernelTitle);      } else if (tmplLine->type == LT_MENUENTRY &&
3929   newLine->elements[1].indent = strdup("");         (needs & NEED_TITLE)) {
3930   newLine->numElements = 2;   requote(tmplLine, config->cfi);
3931     char *nkt = malloc(strlen(newKernelTitle)+3);
3932     strcpy(nkt, "'");
3933     strcat(nkt, newKernelTitle);
3934     strcat(nkt, "'");
3935     newLine = addLineTmpl(new, tmplLine, newLine, nkt, config->cfi);
3936     free(nkt);
3937     needs &= ~NEED_TITLE;
3938      } else if (tmplLine->type == LT_TITLE &&      } else if (tmplLine->type == LT_TITLE &&
3939                         config->cfi->titleBracketed &&         (needs & NEED_TITLE)) {
3940                         tmplLine->numElements == 1) {   if (tmplLine->numElements >= 2) {
3941                  needs &= ~KERNEL_TITLE;      newLine = addLineTmpl(new, tmplLine, newLine,
3942                  free(newLine->elements[0].item);    newKernelTitle, config->cfi);
3943                  free(newLine->elements[0].indent);      needs &= ~NEED_TITLE;
3944                  newLine->elements = malloc(sizeof(*newLine->elements) *   } else if (tmplLine->numElements == 1 &&
3945                                             newLine->numElements);     config->cfi->titleBracketed) {
3946        /* addLineTmpl doesn't handle titleBracketed */
3947                  newLine->elements[0].item = malloc(strlen(newKernelTitle) + 3);      newLine = addLine(new, config->cfi, LT_TITLE,
3948                  sprintf(newLine->elements[0].item, "[%s]", newKernelTitle);        tmplLine->indent, newKernelTitle);
3949                  newLine->elements[0].indent = strdup("");      needs &= ~NEED_TITLE;
3950                  newLine->numElements = 1;   }
3951              }      } else if (tmplLine->type == LT_ECHO) {
3952        requote(tmplLine, config->cfi);
3953        static const char *prefix = "'Loading ";
3954        if (tmplLine->numElements > 1 &&
3955        strstr(tmplLine->elements[1].item, prefix) &&
3956        masterLine->next &&
3957        iskernel(masterLine->next->type)) {
3958     char *newTitle = malloc(strlen(prefix) +
3959     strlen(newKernelTitle) + 2);
3960    
3961     strcpy(newTitle, prefix);
3962     strcat(newTitle, newKernelTitle);
3963     strcat(newTitle, "'");
3964     newLine = addLine(new, config->cfi, LT_ECHO,
3965     tmplLine->indent, newTitle);
3966     free(newTitle);
3967        } else {
3968     /* pass through other lines from the template */
3969     newLine = addLineTmpl(new, tmplLine, newLine, NULL,
3970     config->cfi);
3971        }
3972        } else if (tmplLine->type == LT_DEVTREE &&
3973           tmplLine->numElements == 2 && newDevTreePath) {
3974            newLine = addLineTmpl(new, tmplLine, newLine,
3975          newDevTreePath + strlen(prefix),
3976          config->cfi);
3977     needs &= ~NEED_DEVTREE;
3978        } else if (tmplLine->type == LT_ENTRY_END && needs & NEED_DEVTREE) {
3979     const char *ndtp = newDevTreePath;
3980     if (!strncmp(newDevTreePath, prefix, strlen(prefix)))
3981        ndtp += strlen(prefix);
3982     newLine = addLine(new, config->cfi, LT_DEVTREE,
3983      config->secondaryIndent,
3984      ndtp);
3985     needs &= ~NEED_DEVTREE;
3986     newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
3987        } else {
3988     /* pass through other lines from the template */
3989     newLine = addLineTmpl(new, tmplLine, newLine, NULL, config->cfi);
3990        }
3991   }   }
3992    
3993      } else {      } else {
3994   for (i = 0; config->cfi->keywords[i].key; i++) {   /* don't have a template, so start the entry with the
3995      if ((config->cfi->keywords[i].type == config->cfi->entrySeparator) || (config->cfi->keywords[i].type == LT_OTHER))   * appropriate starting line
3996     */
3997     switch (config->cfi->entryStart) {
3998        case LT_KERNEL:
3999        case LT_KERNEL_EFI:
4000        case LT_KERNEL_16:
4001     if (new->multiboot && config->cfi->mbHyperFirst) {
4002        /* fall through to LT_HYPER */
4003     } else {
4004        newLine = addLine(new, config->cfi,
4005              preferredLineType(LT_KERNEL, config->cfi),
4006          config->primaryIndent,
4007          newKernelPath + strlen(prefix));
4008        needs &= ~NEED_KERNEL;
4009        break;
4010     }
4011    
4012        case LT_HYPER:
4013     newLine = addLine(new, config->cfi, LT_HYPER,
4014      config->primaryIndent,
4015      newMBKernel + strlen(prefix));
4016     needs &= ~NEED_MB;
4017   break;   break;
         }  
4018    
4019   switch (config->cfi->keywords[i].type) {      case LT_MENUENTRY: {
4020      case LT_KERNEL:  needs &= ~KERNEL_KERNEL,   char *nkt = malloc(strlen(newKernelTitle)+3);
4021       chptr = newKernelPath + strlen(prefix);   strcpy(nkt, "'");
4022       type = LT_KERNEL; break;   strcat(nkt, newKernelTitle);
4023      case LT_TITLE:   needs &= ~KERNEL_TITLE, chptr = newKernelTitle;   strcat(nkt, "'");
4024       type = LT_TITLE; break;          newLine = addLine(new, config->cfi, LT_MENUENTRY,
4025      default:        config->primaryIndent, nkt);
4026                  /* zipl strikes again */   free(nkt);
4027                  if (config->cfi->titleBracketed) {   needs &= ~NEED_TITLE;
4028                      needs &= ~KERNEL_TITLE;   needs |= NEED_END;
4029                      chptr = newKernelTitle;   break;
4030                      type = LT_TITLE;      }
4031                      break;      case LT_TITLE:
4032                  } else {   if( useextlinuxmenu != 0 ){ // We just need useextlinuxmenu to not be zero (set above)
4033                      abort();   char * templabel;
4034                  }   int x = 0, y = 0;
4035   }  
4036     templabel = strdup(newKernelTitle);
4037     while( templabel[x]){
4038     if( templabel[x] == ' ' ){
4039     y = x;
4040     while( templabel[y] ){
4041     templabel[y] = templabel[y+1];
4042     y++;
4043     }
4044     }
4045     x++;
4046     }
4047     newLine = addLine(new, config->cfi, LT_TITLE,
4048      config->primaryIndent, templabel);
4049     free(templabel);
4050     }else{
4051     newLine = addLine(new, config->cfi, LT_TITLE,
4052      config->primaryIndent, newKernelTitle);
4053     }
4054     needs &= ~NEED_TITLE;
4055     break;
4056    
4057   newLine = addLine(new, config->cfi, type, config->primaryIndent, chptr);      default:
4058   new->lines = newLine;   abort();
4059     }
4060      }      }
4061    
4062      if (new->multiboot) {      struct singleLine *endLine = NULL;
4063          if (needs & KERNEL_MB)      endLine = getLineByType(LT_ENTRY_END, new->lines);
4064              newLine = addLine(new, config->cfi, LT_KERNEL,      if (endLine) {
4065                                config->secondaryIndent,      removeLine(new, endLine);
4066                                newMBKernel + strlen(prefix));      needs |= NEED_END;
4067          if (needs & KERNEL_KERNEL)      }
4068              newLine = addLine(new, config->cfi, LT_MBMODULE,  
4069                                config->secondaryIndent,      /* add the remainder of the lines, i.e. those that either
4070                                newKernelPath + strlen(prefix));       * weren't present in the template, or in the case of no template,
4071          /* don't need to check for title as it's guaranteed to have been       * all the lines following the entryStart.
4072           * done as we only do multiboot with grub which uses title as       */
4073           * a separator */      if (needs & NEED_TITLE) {
4074          if (needs & KERNEL_INITRD && newKernelInitrd)   newLine = addLine(new, config->cfi, LT_TITLE,
4075              newLine = addLine(new, config->cfi, LT_MBMODULE,    config->secondaryIndent,
4076                                config->secondaryIndent,    newKernelTitle);
4077                                newKernelInitrd + strlen(prefix));   needs &= ~NEED_TITLE;
4078      } else {      }
4079          if (needs & KERNEL_KERNEL)      if ((needs & NEED_MB) && config->cfi->mbHyperFirst) {
4080              newLine = addLine(new, config->cfi, LT_KERNEL,   newLine = addLine(new, config->cfi, LT_HYPER,
4081                                config->secondaryIndent,    config->secondaryIndent,
4082                                newKernelPath + strlen(prefix));    newMBKernel + strlen(prefix));
4083          if (needs & KERNEL_TITLE)   needs &= ~NEED_MB;
4084              newLine = addLine(new, config->cfi, LT_TITLE,      }
4085                                config->secondaryIndent,      if (needs & NEED_KERNEL) {
4086                                newKernelTitle);   newLine = addLine(new, config->cfi,
4087          if (needs & KERNEL_INITRD && newKernelInitrd)    (new->multiboot && getKeywordByType(LT_MBMODULE,
4088              newLine = addLine(new, config->cfi, LT_INITRD,        config->cfi))
4089                                config->secondaryIndent,     ? LT_MBMODULE
4090                                newKernelInitrd + strlen(prefix));   : preferredLineType(LT_KERNEL, config->cfi),
4091      config->secondaryIndent,
4092      newKernelPath + strlen(prefix));
4093     needs &= ~NEED_KERNEL;
4094        }
4095        if (needs & NEED_MB) {
4096     newLine = addLine(new, config->cfi, LT_HYPER,
4097      config->secondaryIndent,
4098      newMBKernel + strlen(prefix));
4099     needs &= ~NEED_MB;
4100        }
4101        if (needs & NEED_INITRD) {
4102     char *initrdVal;
4103     initrdVal = getInitrdVal(config, prefix, NULL, newKernelInitrd, extraInitrds, extraInitrdCount);
4104     newLine = addLine(new, config->cfi,
4105      (new->multiboot && getKeywordByType(LT_MBMODULE,
4106          config->cfi))
4107       ? LT_MBMODULE
4108       : preferredLineType(LT_INITRD, config->cfi),
4109      config->secondaryIndent,
4110      initrdVal);
4111     free(initrdVal);
4112     needs &= ~NEED_INITRD;
4113        }
4114        if (needs & NEED_DEVTREE) {
4115     newLine = addLine(new, config->cfi, LT_DEVTREE,
4116      config->secondaryIndent,
4117      newDevTreePath);
4118     needs &= ~NEED_DEVTREE;
4119        }
4120    
4121        /* NEEDS_END must be last on bootloaders that need it... */
4122        if (needs & NEED_END) {
4123     newLine = addLine(new, config->cfi, LT_ENTRY_END,
4124     config->secondaryIndent, NULL);
4125     needs &= ~NEED_END;
4126        }
4127    
4128        if (needs) {
4129     printf(_("grubby: needs=%d, aborting\n"), needs);
4130     abort();
4131      }      }
4132    
4133      if (updateImage(config, "0", prefix, newKernelArgs, NULL,      if (updateImage(config, "0", prefix, newKernelArgs, NULL,
# Line 2274  int addNewKernel(struct grubConfig * con Line 4136  int addNewKernel(struct grubConfig * con
4136      return 0;      return 0;
4137  }  }
4138    
4139    static void traceback(int signum)
4140    {
4141        void *array[40];
4142        size_t size;
4143    
4144        signal(SIGSEGV, SIG_DFL);
4145        memset(array, '\0', sizeof (array));
4146        size = backtrace(array, 40);
4147    
4148        fprintf(stderr, "grubby received SIGSEGV!  Backtrace (%ld):\n",
4149                (unsigned long)size);
4150        backtrace_symbols_fd(array, size, STDERR_FILENO);
4151        exit(1);
4152    }
4153    
4154  int main(int argc, const char ** argv) {  int main(int argc, const char ** argv) {
4155      poptContext optCon;      poptContext optCon;
4156      char * grubConfig = NULL;      const char * grubConfig = NULL;
4157      char * outputFile = NULL;      char * outputFile = NULL;
4158      int arg = 0;      int arg = 0;
4159      int flags = 0;      int flags = 0;
4160      int badImageOkay = 0;      int badImageOkay = 0;
4161        int configureGrub2 = 0;
4162      int configureLilo = 0, configureELilo = 0, configureGrub = 0;      int configureLilo = 0, configureELilo = 0, configureGrub = 0;
4163      int configureYaboot = 0, configureSilo = 0, configureZipl = 0;      int configureYaboot = 0, configureSilo = 0, configureZipl = 0;
4164        int configureExtLinux = 0;
4165      int bootloaderProbe = 0;      int bootloaderProbe = 0;
4166        int extraInitrdCount = 0;
4167      char * updateKernelPath = NULL;      char * updateKernelPath = NULL;
4168      char * newKernelPath = NULL;      char * newKernelPath = NULL;
4169      char * removeKernelPath = NULL;      char * removeKernelPath = NULL;
4170      char * newKernelArgs = NULL;      char * newKernelArgs = NULL;
4171      char * newKernelInitrd = NULL;      char * newKernelInitrd = NULL;
4172      char * newKernelTitle = NULL;      char * newKernelTitle = NULL;
4173      char * newKernelVersion = NULL;      char * newDevTreePath = NULL;
4174      char * newMBKernel = NULL;      char * newMBKernel = NULL;
4175      char * newMBKernelArgs = NULL;      char * newMBKernelArgs = NULL;
4176      char * removeMBKernelArgs = NULL;      char * removeMBKernelArgs = NULL;
# Line 2299  int main(int argc, const char ** argv) { Line 4179  int main(int argc, const char ** argv) {
4179      char * defaultKernel = NULL;      char * defaultKernel = NULL;
4180      char * removeArgs = NULL;      char * removeArgs = NULL;
4181      char * kernelInfo = NULL;      char * kernelInfo = NULL;
4182        char * extraInitrds[MAX_EXTRA_INITRDS] = { NULL };
4183        char * envPath = NULL;
4184      const char * chptr = NULL;      const char * chptr = NULL;
4185      struct configFileInfo * cfi = NULL;      struct configFileInfo * cfi = NULL;
4186      struct grubConfig * config;      struct grubConfig * config;
4187      struct singleEntry * template = NULL;      struct singleEntry * template = NULL;
4188      int copyDefault = 0, makeDefault = 0;      int copyDefault = 0, makeDefault = 0;
4189      int displayDefault = 0;      int displayDefault = 0;
4190        int displayDefaultIndex = 0;
4191        int displayDefaultTitle = 0;
4192        int defaultIndex = -1;
4193      struct poptOption options[] = {      struct poptOption options[] = {
4194   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,   { "add-kernel", 0, POPT_ARG_STRING, &newKernelPath, 0,
4195      _("add an entry for the specified kernel"), _("kernel-path") },      _("add an entry for the specified kernel"), _("kernel-path") },
# Line 2322  int main(int argc, const char ** argv) { Line 4207  int main(int argc, const char ** argv) {
4207   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,   { "boot-filesystem", 0, POPT_ARG_STRING, &bootPrefix, 0,
4208      _("filestystem which contains /boot directory (for testing only)"),      _("filestystem which contains /boot directory (for testing only)"),
4209      _("bootfs") },      _("bootfs") },
4210  #if defined(__i386__) || defined(__x86_64__)  #if defined(__i386__) || defined(__x86_64__) || defined (__powerpc64__) || defined (__ia64__)
4211   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,   { "bootloader-probe", 0, POPT_ARG_NONE, &bootloaderProbe, 0,
4212      _("check if lilo is installed on lilo.conf boot sector") },      _("check which bootloader is installed on boot sector") },
4213  #endif  #endif
4214   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,   { "config-file", 'c', POPT_ARG_STRING, &grubConfig, 0,
4215      _("path to grub config file to update (\"-\" for stdin)"),      _("path to grub config file to update (\"-\" for stdin)"),
# Line 2335  int main(int argc, const char ** argv) { Line 4220  int main(int argc, const char ** argv) {
4220        "the kernel referenced by the default image does not exist, "        "the kernel referenced by the default image does not exist, "
4221        "the first linux entry whose kernel does exist is used as the "        "the first linux entry whose kernel does exist is used as the "
4222        "template"), NULL },        "template"), NULL },
4223     { "debug", 0, 0, &debug, 0,
4224        _("print debugging information for failures") },
4225   { "default-kernel", 0, 0, &displayDefault, 0,   { "default-kernel", 0, 0, &displayDefault, 0,
4226      _("display the path of the default kernel") },      _("display the path of the default kernel") },
4227     { "default-index", 0, 0, &displayDefaultIndex, 0,
4228        _("display the index of the default kernel") },
4229     { "default-title", 0, 0, &displayDefaultTitle, 0,
4230        _("display the title of the default kernel") },
4231     { "devtree", 0, POPT_ARG_STRING, &newDevTreePath, 0,
4232        _("device tree file for new stanza"), _("dtb-path") },
4233   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,   { "elilo", 0, POPT_ARG_NONE, &configureELilo, 0,
4234      _("configure elilo bootloader") },      _("configure elilo bootloader") },
4235     { "efi", 0, POPT_ARG_NONE, &isEfi, 0,
4236        _("force grub2 stanzas to use efi") },
4237     { "env", 0, POPT_ARG_STRING, &envPath, 0,
4238        _("path for environment data"),
4239        _("path") },
4240     { "extlinux", 0, POPT_ARG_NONE, &configureExtLinux, 0,
4241        _("configure extlinux bootloader (from syslinux)") },
4242   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,   { "grub", 0, POPT_ARG_NONE, &configureGrub, 0,
4243      _("configure grub bootloader") },      _("configure grub bootloader") },
4244     { "grub2", 0, POPT_ARG_NONE, &configureGrub2, 0,
4245        _("configure grub2 bootloader") },
4246   { "info", 0, POPT_ARG_STRING, &kernelInfo, 0,   { "info", 0, POPT_ARG_STRING, &kernelInfo, 0,
4247      _("display boot information for specified kernel"),      _("display boot information for specified kernel"),
4248      _("kernel-path") },      _("kernel-path") },
4249   { "initrd", 0, POPT_ARG_STRING, &newKernelInitrd, 0,   { "initrd", 0, POPT_ARG_STRING, &newKernelInitrd, 0,
4250      _("initrd image for the new kernel"), _("initrd-path") },      _("initrd image for the new kernel"), _("initrd-path") },
4251     { "extra-initrd", 'i', POPT_ARG_STRING, NULL, 'i',
4252        _("auxiliary initrd image for things other than the new kernel"), _("initrd-path") },
4253   { "lilo", 0, POPT_ARG_NONE, &configureLilo, 0,   { "lilo", 0, POPT_ARG_NONE, &configureLilo, 0,
4254      _("configure lilo bootloader") },      _("configure lilo bootloader") },
4255   { "make-default", 0, 0, &makeDefault, 0,   { "make-default", 0, 0, &makeDefault, 0,
# Line 2365  int main(int argc, const char ** argv) { Line 4269  int main(int argc, const char ** argv) {
4269   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,   { "set-default", 0, POPT_ARG_STRING, &defaultKernel, 0,
4270      _("make the first entry referencing the specified kernel "      _("make the first entry referencing the specified kernel "
4271        "the default"), _("kernel-path") },        "the default"), _("kernel-path") },
4272     { "set-default-index", 0, POPT_ARG_INT, &defaultIndex, 0,
4273        _("make the given entry index the default entry"),
4274        _("entry-index") },
4275   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,   { "silo", 0, POPT_ARG_NONE, &configureSilo, 0,
4276      _("configure silo bootloader") },      _("configure silo bootloader") },
4277   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,   { "title", 0, POPT_ARG_STRING, &newKernelTitle, 0,
# Line 2382  int main(int argc, const char ** argv) { Line 4289  int main(int argc, const char ** argv) {
4289   { 0, 0, 0, 0, 0 }   { 0, 0, 0, 0, 0 }
4290      };      };
4291    
4292        useextlinuxmenu=0;
4293    
4294        signal(SIGSEGV, traceback);
4295    
4296        int i = 0;
4297        for (int j = 1; j < argc; j++)
4298     i += strlen(argv[j]) + 1;
4299        saved_command_line = malloc(i);
4300        if (!saved_command_line) {
4301     fprintf(stderr, "grubby: %m\n");
4302     exit(1);
4303        }
4304        saved_command_line[0] = '\0';
4305        for (int j = 1; j < argc; j++) {
4306     strcat(saved_command_line, argv[j]);
4307     strncat(saved_command_line, j == argc -1 ? "" : " ", 1);
4308        }
4309    
4310      optCon = poptGetContext("grubby", argc, argv, options, 0);      optCon = poptGetContext("grubby", argc, argv, options, 0);
4311      poptReadDefaultConfig(optCon, 1);      poptReadDefaultConfig(optCon, 1);
4312    
# Line 2391  int main(int argc, const char ** argv) { Line 4316  int main(int argc, const char ** argv) {
4316      printf("grubby version %s\n", VERSION);      printf("grubby version %s\n", VERSION);
4317      exit(0);      exit(0);
4318      break;      break;
4319      case 'i':
4320        if (extraInitrdCount < MAX_EXTRA_INITRDS) {
4321         extraInitrds[extraInitrdCount++] = strdup(poptGetOptArg(optCon));
4322        } else {
4323     fprintf(stderr, _("grubby: extra initrd maximum is %d\n"), extraInitrdCount);
4324     return 1;
4325        }
4326        break;
4327   }   }
4328      }      }
4329    
# Line 2406  int main(int argc, const char ** argv) { Line 4339  int main(int argc, const char ** argv) {
4339   return 1;   return 1;
4340      }      }
4341    
4342      if ((configureLilo + configureGrub + configureELilo +      if ((configureLilo + configureGrub2 + configureGrub + configureELilo +
4343   configureYaboot + configureSilo + configureZipl) > 1) {   configureYaboot + configureSilo + configureZipl +
4344     configureExtLinux ) > 1) {
4345   fprintf(stderr, _("grubby: cannot specify multiple bootloaders\n"));   fprintf(stderr, _("grubby: cannot specify multiple bootloaders\n"));
4346   return 1;   return 1;
4347      } else if (bootloaderProbe && grubConfig) {      } else if (bootloaderProbe && grubConfig) {
4348   fprintf(stderr,   fprintf(stderr,
4349      _("grubby: cannot specify config file with --bootloader-probe\n"));      _("grubby: cannot specify config file with --bootloader-probe\n"));
4350   return 1;   return 1;
4351        } else if (configureGrub2) {
4352     cfi = &grub2ConfigType;
4353     if (envPath)
4354        cfi->envFile = envPath;
4355      } else if (configureLilo) {      } else if (configureLilo) {
4356   cfi = &liloConfigType;   cfi = &liloConfigType;
4357      } else if (configureGrub) {      } else if (configureGrub) {
# Line 2426  int main(int argc, const char ** argv) { Line 4364  int main(int argc, const char ** argv) {
4364          cfi = &siloConfigType;          cfi = &siloConfigType;
4365      } else if (configureZipl) {      } else if (configureZipl) {
4366          cfi = &ziplConfigType;          cfi = &ziplConfigType;
4367        } else if (configureExtLinux) {
4368     cfi = &extlinuxConfigType;
4369     useextlinuxmenu=1;
4370      }      }
4371    
4372      if (!cfi) {      if (!cfi) {
4373            if (grub2FindConfig(&grub2ConfigType))
4374        cfi = &grub2ConfigType;
4375     else
4376        #ifdef __ia64__        #ifdef __ia64__
4377   cfi = &eliloConfigType;      cfi = &eliloConfigType;
4378        #elif __powerpc__        #elif __powerpc__
4379   cfi = &yabootConfigType;      cfi = &yabootConfigType;
4380        #elif __sparc__        #elif __sparc__
4381          cfi = &siloConfigType;              cfi = &siloConfigType;
4382        #elif __s390__        #elif __s390__
4383          cfi = &ziplConfigType;              cfi = &ziplConfigType;
4384        #elif __s390x__        #elif __s390x__
4385          cfi = &ziplConfigtype;              cfi = &ziplConfigtype;
4386        #else        #else
4387   cfi = &grubConfigType;      cfi = &grubConfigType;
4388        #endif        #endif
4389      }      }
4390    
4391      if (!grubConfig)      if (!grubConfig) {
4392   grubConfig = cfi->defaultConfig;   if (cfi->findConfig)
4393        grubConfig = cfi->findConfig(cfi);
4394     if (!grubConfig)
4395        grubConfig = cfi->defaultConfig;
4396        }
4397    
4398      if (bootloaderProbe && (displayDefault || kernelInfo || newKernelVersion ||      if (bootloaderProbe && (displayDefault || kernelInfo ||
4399    newKernelPath || removeKernelPath || makeDefault ||      newKernelPath || removeKernelPath || makeDefault ||
4400    defaultKernel)) {      defaultKernel || displayDefaultIndex || displayDefaultTitle ||
4401        (defaultIndex >= 0))) {
4402   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "   fprintf(stderr, _("grubby: --bootloader-probe may not be used with "
4403    "specified option"));    "specified option"));
4404   return 1;   return 1;
4405      }      }
4406    
4407      if ((displayDefault || kernelInfo) && (newKernelVersion || newKernelPath ||      if ((displayDefault || kernelInfo) && (newKernelPath ||
4408     removeKernelPath)) {     removeKernelPath)) {
4409   fprintf(stderr, _("grubby: --default-kernel and --info may not "   fprintf(stderr, _("grubby: --default-kernel and --info may not "
4410    "be used when adding or removing kernels\n"));    "be used when adding or removing kernels\n"));
# Line 2465  int main(int argc, const char ** argv) { Line 4414  int main(int argc, const char ** argv) {
4414      if (newKernelPath && !newKernelTitle) {      if (newKernelPath && !newKernelTitle) {
4415   fprintf(stderr, _("grubby: kernel title must be specified\n"));   fprintf(stderr, _("grubby: kernel title must be specified\n"));
4416   return 1;   return 1;
4417      } else if (!newKernelPath && (newKernelTitle  || newKernelInitrd ||      } else if (!newKernelPath && (newKernelTitle  || copyDefault ||
4418    newKernelInitrd || copyDefault     ||    (newKernelInitrd && !updateKernelPath)||
4419    makeDefault)) {    makeDefault || extraInitrdCount > 0)) {
4420   fprintf(stderr, _("grubby: kernel path expected\n"));   fprintf(stderr, _("grubby: kernel path expected\n"));
4421   return 1;   return 1;
4422      }      }
# Line 2491  int main(int argc, const char ** argv) { Line 4440  int main(int argc, const char ** argv) {
4440   makeDefault = 1;   makeDefault = 1;
4441   defaultKernel = NULL;   defaultKernel = NULL;
4442      }      }
4443        else if (defaultKernel && (defaultIndex >= 0)) {
4444     fprintf(stderr, _("grubby: --set-default and --set-default-index "
4445      "may not be used together\n"));
4446     return 1;
4447        }
4448    
4449      if (!strcmp(grubConfig, "-") && !outputFile) {      if (grubConfig && !strcmp(grubConfig, "-") && !outputFile) {
4450   fprintf(stderr, _("grubby: output file must be specified if stdin "   fprintf(stderr, _("grubby: output file must be specified if stdin "
4451   "is used\n"));   "is used\n"));
4452   return 1;   return 1;
4453      }      }
4454    
4455      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel      if (!removeKernelPath && !newKernelPath && !displayDefault && !defaultKernel
4456   && !kernelInfo && !bootloaderProbe && !updateKernelPath   && !kernelInfo && !bootloaderProbe && !updateKernelPath
4457          && !removeMBKernel) {   && !removeMBKernel && !displayDefaultIndex && !displayDefaultTitle
4458     && (defaultIndex == -1)) {
4459   fprintf(stderr, _("grubby: no action specified\n"));   fprintf(stderr, _("grubby: no action specified\n"));
4460   return 1;   return 1;
4461      }      }
# Line 2520  int main(int argc, const char ** argv) { Line 4475  int main(int argc, const char ** argv) {
4475   bootPrefix = "";   bootPrefix = "";
4476      }      }
4477    
4478        if (!cfi->mbAllowExtraInitRds &&
4479     extraInitrdCount > 0) {
4480     fprintf(stderr, _("grubby: %s doesn't allow multiple initrds\n"), cfi->defaultConfig);
4481     return 1;
4482        }
4483    
4484      if (bootloaderProbe) {      if (bootloaderProbe) {
4485   int lrc = 0, grc = 0;   int lrc = 0, grc = 0, gr2c = 0, extrc = 0, yrc = 0, erc = 0;
4486   struct grubConfig * lconfig, * gconfig;   struct grubConfig * lconfig, * gconfig, * yconfig, * econfig;
4487    
4488     const char *grub2config = grub2FindConfig(&grub2ConfigType);
4489     if (grub2config) {
4490        gconfig = readConfig(grub2config, &grub2ConfigType);
4491        if (!gconfig)
4492     gr2c = 1;
4493        else
4494     gr2c = checkForGrub2(gconfig);
4495     }
4496    
4497   if (!access(grubConfigType.defaultConfig, F_OK)) {   const char *grubconfig = grubFindConfig(&grubConfigType);
4498      gconfig = readConfig(grubConfigType.defaultConfig, &grubConfigType);   if (!access(grubconfig, F_OK)) {
4499        gconfig = readConfig(grubconfig, &grubConfigType);
4500      if (!gconfig)      if (!gconfig)
4501   grc = 1;   grc = 1;
4502      else      else
# Line 2540  int main(int argc, const char ** argv) { Line 4511  int main(int argc, const char ** argv) {
4511   lrc = checkForLilo(lconfig);   lrc = checkForLilo(lconfig);
4512   }   }
4513    
4514   if (lrc == 1 || grc == 1) return 1;   if (!access(eliloConfigType.defaultConfig, F_OK)) {
4515        econfig = readConfig(eliloConfigType.defaultConfig,
4516     &eliloConfigType);
4517        if (!econfig)
4518     erc = 1;
4519        else
4520     erc = checkForElilo(econfig);
4521     }
4522    
4523     if (!access(extlinuxConfigType.defaultConfig, F_OK)) {
4524        lconfig = readConfig(extlinuxConfigType.defaultConfig, &extlinuxConfigType);
4525        if (!lconfig)
4526     extrc = 1;
4527        else
4528     extrc = checkForExtLinux(lconfig);
4529     }
4530    
4531    
4532     if (!access(yabootConfigType.defaultConfig, F_OK)) {
4533        yconfig = readConfig(yabootConfigType.defaultConfig,
4534     &yabootConfigType);
4535        if (!yconfig)
4536     yrc = 1;
4537        else
4538     yrc = checkForYaboot(yconfig);
4539     }
4540    
4541     if (lrc == 1 || grc == 1 || gr2c == 1 || extrc == 1 || yrc == 1 ||
4542     erc == 1)
4543        return 1;
4544    
4545   if (lrc == 2) printf("lilo\n");   if (lrc == 2) printf("lilo\n");
4546     if (gr2c == 2) printf("grub2\n");
4547   if (grc == 2) printf("grub\n");   if (grc == 2) printf("grub\n");
4548     if (extrc == 2) printf("extlinux\n");
4549     if (yrc == 2) printf("yaboot\n");
4550     if (erc == 2) printf("elilo\n");
4551    
4552   return 0;   return 0;
4553      }      }
4554    
4555        if (grubConfig == NULL) {
4556     printf("Could not find bootloader configuration file.\n");
4557     exit(1);
4558        }
4559    
4560      config = readConfig(grubConfig, cfi);      config = readConfig(grubConfig, cfi);
4561      if (!config) return 1;      if (!config) return 1;
4562    
# Line 2557  int main(int argc, const char ** argv) { Line 4566  int main(int argc, const char ** argv) {
4566          char * rootspec;          char * rootspec;
4567    
4568   if (config->defaultImage == -1) return 0;   if (config->defaultImage == -1) return 0;
4569     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
4570     cfi->defaultIsSaved)
4571        config->defaultImage = 0;
4572   entry = findEntryByIndex(config, config->defaultImage);   entry = findEntryByIndex(config, config->defaultImage);
4573   if (!entry) return 0;   if (!entry) return 0;
4574   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;   if (!suitableImage(entry, bootPrefix, 0, flags)) return 0;
4575    
4576   line = entry->lines;   line = getLineByType(LT_KERNEL|LT_HYPER|LT_KERNEL_EFI|LT_KERNEL_16, entry->lines);
  while (line && line->type != LT_KERNEL) line = line->next;  
4577   if (!line) return 0;   if (!line) return 0;
4578    
4579          rootspec = getRootSpecifier(line->elements[1].item);          rootspec = getRootSpecifier(line->elements[1].item);
# Line 2570  int main(int argc, const char ** argv) { Line 4581  int main(int argc, const char ** argv) {
4581                 ((rootspec != NULL) ? strlen(rootspec) : 0));                 ((rootspec != NULL) ? strlen(rootspec) : 0));
4582    
4583   return 0;   return 0;
4584    
4585        } else if (displayDefaultTitle) {
4586     struct singleLine * line;
4587     struct singleEntry * entry;
4588    
4589     if (config->defaultImage == -1) return 0;
4590     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
4591     cfi->defaultIsSaved)
4592        config->defaultImage = 0;
4593     entry = findEntryByIndex(config, config->defaultImage);
4594     if (!entry) return 0;
4595    
4596     if (!configureGrub2) {
4597      line = getLineByType(LT_TITLE, entry->lines);
4598      if (!line) return 0;
4599      printf("%s\n", line->elements[1].item);
4600    
4601     } else {
4602      char * title;
4603    
4604      dbgPrintf("This is GRUB2, default title is embeded in menuentry\n");
4605      line = getLineByType(LT_MENUENTRY, entry->lines);
4606      if (!line) return 0;
4607      title = grub2ExtractTitle(line);
4608      if (title)
4609        printf("%s\n", title);
4610     }
4611     return 0;
4612    
4613        } else if (displayDefaultIndex) {
4614            if (config->defaultImage == -1) return 0;
4615     if (config->defaultImage == DEFAULT_SAVED_GRUB2 &&
4616     cfi->defaultIsSaved)
4617        config->defaultImage = 0;
4618            printf("%i\n", config->defaultImage);
4619            return 0;
4620    
4621      } else if (kernelInfo)      } else if (kernelInfo)
4622   return displayInfo(config, kernelInfo, bootPrefix);   return displayInfo(config, kernelInfo, bootPrefix);
4623    
# Line 2581  int main(int argc, const char ** argv) { Line 4629  int main(int argc, const char ** argv) {
4629      markRemovedImage(config, removeKernelPath, bootPrefix);      markRemovedImage(config, removeKernelPath, bootPrefix);
4630      markRemovedImage(config, removeMBKernel, bootPrefix);      markRemovedImage(config, removeMBKernel, bootPrefix);
4631      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,      setDefaultImage(config, newKernelPath != NULL, defaultKernel, makeDefault,
4632      bootPrefix, flags);      bootPrefix, flags, defaultIndex);
4633      setFallbackImage(config, newKernelPath != NULL);      setFallbackImage(config, newKernelPath != NULL);
4634      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,      if (updateImage(config, updateKernelPath, bootPrefix, newKernelArgs,
4635                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;                      removeArgs, newMBKernelArgs, removeMBKernelArgs)) return 1;
4636        if (updateKernelPath && newKernelInitrd) {
4637        if (newMBKernel) {
4638        if (addMBInitrd(config, newMBKernel, updateKernelPath,
4639     bootPrefix, newKernelInitrd))
4640        return 1;
4641        } else {
4642        if (updateInitrd(config, updateKernelPath, bootPrefix,
4643     newKernelInitrd))
4644     return 1;
4645        }
4646        }
4647      if (addNewKernel(config, template, bootPrefix, newKernelPath,      if (addNewKernel(config, template, bootPrefix, newKernelPath,
4648                       newKernelTitle, newKernelArgs, newKernelInitrd,                       newKernelTitle, newKernelArgs, newKernelInitrd,
4649                       newMBKernel, newMBKernelArgs)) return 1;                       (const char **)extraInitrds, extraInitrdCount,
4650                         newMBKernel, newMBKernelArgs, newDevTreePath)) return 1;
4651            
4652    
4653      if (numEntries(config) == 0) {      if (numEntries(config) == 0) {
# Line 2597  int main(int argc, const char ** argv) { Line 4657  int main(int argc, const char ** argv) {
4657      }      }
4658    
4659      if (!outputFile)      if (!outputFile)
4660   outputFile = grubConfig;   outputFile = (char *)grubConfig;
4661    
4662      return writeConfig(config, outputFile, bootPrefix);      return writeConfig(config, outputFile, bootPrefix);
4663  }  }

Legend:
Removed from v.532  
changed lines
  Added in v.2959