Magellan Linux

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

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

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

    revision 1844 by niro, Mon Jul 2 12:59:07 2012 UTC revision 1852 by niro, Mon Jul 2 13:11:38 2012 UTC
    # Line 164  struct keywordTypes grubKeywords[] = { Line 164  struct keywordTypes grubKeywords[] = {
    164    
    165  const char *grubFindConfig(struct configFileInfo *cfi) {  const char *grubFindConfig(struct configFileInfo *cfi) {
    166      static const char *configFiles[] = {      static const char *configFiles[] = {
      "/etc/grub.conf",  
    167   "/boot/grub/grub.conf",   "/boot/grub/grub.conf",
    168   "/boot/grub/menu.lst",   "/boot/grub/menu.lst",
    169     "/etc/grub.conf",
    170   NULL   NULL
    171      };      };
    172      static int i = -1;      static int i = -1;
    # Line 243  const char *grub2FindConfig(struct confi Line 243  const char *grub2FindConfig(struct confi
    243  }  }
    244    
    245  int sizeOfSingleLine(struct singleLine * line) {  int sizeOfSingleLine(struct singleLine * line) {
       int i;  
    246    int count = 0;    int count = 0;
    247    
    248    for (i = 0; i < line->numElements; i++) {    for (int i = 0; i < line->numElements; i++) {
    249      int indentSize = 0;      int indentSize = 0;
    250    
    251      count = count + strlen(line->elements[i].item);      count = count + strlen(line->elements[i].item);
    # Line 573  static char * sdupprintf(const char *for Line 572  static char * sdupprintf(const char *for
    572    
    573  static struct keywordTypes * getKeywordByType(enum lineType_e type,  static struct keywordTypes * getKeywordByType(enum lineType_e type,
    574        struct configFileInfo * cfi) {        struct configFileInfo * cfi) {
    575      struct keywordTypes * kw;      for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
         for (kw = cfi->keywords; kw->key; kw++) {  
    576   if (kw->type == type)   if (kw->type == type)
    577      return kw;      return kw;
    578      }      }
    # Line 604  static char * getuuidbydev(char *device) Line 602  static char * getuuidbydev(char *device)
    602    
    603  static enum lineType_e getTypeByKeyword(char * keyword,  static enum lineType_e getTypeByKeyword(char * keyword,
    604   struct configFileInfo * cfi) {   struct configFileInfo * cfi) {
    605      struct keywordTypes * kw;      for (struct keywordTypes *kw = cfi->keywords; kw->key; kw++) {
         for (kw = cfi->keywords; kw->key; kw++) {  
    606   if (!strcmp(keyword, kw->key))   if (!strcmp(keyword, kw->key))
    607      return kw->type;      return kw->type;
    608      }      }
    # Line 692  static void lineInit(struct singleLine * Line 689  static void lineInit(struct singleLine *
    689  }  }
    690    
    691  struct singleLine * lineDup(struct singleLine * line) {  struct singleLine * lineDup(struct singleLine * line) {
         int i;  
    692      struct singleLine * newLine = malloc(sizeof(*newLine));      struct singleLine * newLine = malloc(sizeof(*newLine));
    693    
    694      newLine->indent = strdup(line->indent);      newLine->indent = strdup(line->indent);
    # Line 702  struct singleLine * lineDup(struct singl Line 698  struct singleLine * lineDup(struct singl
    698      newLine->elements = malloc(sizeof(*newLine->elements) *      newLine->elements = malloc(sizeof(*newLine->elements) *
    699         newLine->numElements);         newLine->numElements);
    700    
    701      for (i = 0; i < newLine->numElements; i++) {      for (int i = 0; i < newLine->numElements; i++) {
    702   newLine->elements[i].indent = strdup(line->elements[i].indent);   newLine->elements[i].indent = strdup(line->elements[i].indent);
    703   newLine->elements[i].item = strdup(line->elements[i].item);   newLine->elements[i].item = strdup(line->elements[i].item);
    704      }      }
    # Line 711  struct singleLine * lineDup(struct singl Line 707  struct singleLine * lineDup(struct singl
    707  }  }
    708    
    709  static void lineFree(struct singleLine * line) {  static void lineFree(struct singleLine * line) {
         int i;  
       
    710      if (line->indent) free(line->indent);      if (line->indent) free(line->indent);
    711    
    712      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
    713   free(line->elements[i].item);   free(line->elements[i].item);
    714   free(line->elements[i].indent);   free(line->elements[i].indent);
    715      }      }
    # Line 726  static void lineFree(struct singleLine * Line 720  static void lineFree(struct singleLine *
    720    
    721  static int lineWrite(FILE * out, struct singleLine * line,  static int lineWrite(FILE * out, struct singleLine * line,
    722       struct configFileInfo * cfi) {       struct configFileInfo * cfi) {
         int i;  
       
    723      if (fprintf(out, "%s", line->indent) == -1) return -1;      if (fprintf(out, "%s", line->indent) == -1) return -1;
    724    
    725      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
    726   /* Need to handle this, because we strip the quotes from   /* Need to handle this, because we strip the quotes from
    727   * menuentry when read it. */   * menuentry when read it. */
    728   if (line->type == LT_MENUENTRY && i == 1) {   if (line->type == LT_MENUENTRY && i == 1) {
    # Line 836  static int getNextLine(char ** bufPtr, s Line 828  static int getNextLine(char ** bufPtr, s
    828      if (*line->elements[0].item == '#') {      if (*line->elements[0].item == '#') {
    829   char * fullLine;   char * fullLine;
    830   int len;   int len;
      int i;  
    831    
    832   len = strlen(line->indent);   len = strlen(line->indent);
    833   for (i = 0; i < line->numElements; i++)   for (int i = 0; i < line->numElements; i++)
    834      len += strlen(line->elements[i].item) +      len += strlen(line->elements[i].item) +
    835     strlen(line->elements[i].indent);     strlen(line->elements[i].indent);
    836    
    # Line 848  static int getNextLine(char ** bufPtr, s Line 839  static int getNextLine(char ** bufPtr, s
    839   free(line->indent);   free(line->indent);
    840   line->indent = fullLine;   line->indent = fullLine;
    841    
    842   for (i = 0; i < line->numElements; i++) {   for (int i = 0; i < line->numElements; i++) {
    843      strcat(fullLine, line->elements[i].item);      strcat(fullLine, line->elements[i].item);
    844      strcat(fullLine, line->elements[i].indent);      strcat(fullLine, line->elements[i].indent);
    845      free(line->elements[i].item);      free(line->elements[i].item);
    # Line 867  static int getNextLine(char ** bufPtr, s Line 858  static int getNextLine(char ** bufPtr, s
    858   * elements up more   * elements up more
    859   */   */
    860   if (!isspace(kw->separatorChar)) {   if (!isspace(kw->separatorChar)) {
         int i;  
    861      char indent[2] = "";      char indent[2] = "";
    862      indent[0] = kw->separatorChar;      indent[0] = kw->separatorChar;
    863      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    864   char *p;   char *p;
      int j;  
    865   int numNewElements;   int numNewElements;
    866    
    867   numNewElements = 0;   numNewElements = 0;
    # Line 888  static int getNextLine(char ** bufPtr, s Line 877  static int getNextLine(char ** bufPtr, s
    877      sizeof(*line->elements) * elementsAlloced);      sizeof(*line->elements) * elementsAlloced);
    878   }   }
    879    
    880   for (j = line->numElements; j > i; j--) {   for (int j = line->numElements; j > i; j--) {
    881   line->elements[j + numNewElements] = line->elements[j];   line->elements[j + numNewElements] = line->elements[j];
    882   }   }
    883   line->numElements += numNewElements;   line->numElements += numNewElements;
    # Line 926  static struct grubConfig * readConfig(co Line 915  static struct grubConfig * readConfig(co
    915      struct singleLine * last = NULL, * line, * defaultLine = NULL;      struct singleLine * last = NULL, * line, * defaultLine = NULL;
    916      char * end;      char * end;
    917      struct singleEntry * entry = NULL;      struct singleEntry * entry = NULL;
    918      int i, len;      int len;
    919      char * buf;      char * buf;
    920    
    921      if (!strcmp(inName, "-")) {      if (!strcmp(inName, "-")) {
    # Line 989  static struct grubConfig * readConfig(co Line 978  static struct grubConfig * readConfig(co
    978   }   }
    979    
    980   if (line->type == LT_SET_VARIABLE) {   if (line->type == LT_SET_VARIABLE) {
         int i;  
    981      dbgPrintf("found 'set' command (%d elements): ", line->numElements);      dbgPrintf("found 'set' command (%d elements): ", line->numElements);
    982      dbgPrintf("%s", line->indent);      dbgPrintf("%s", line->indent);
    983      for (i = 0; i < line->numElements; i++)      for (int i = 0; i < line->numElements; i++)
    984   dbgPrintf("\"%s\"%s", line->elements[i].item, line->elements[i].indent);   dbgPrintf("\"%s\"%s", line->elements[i].item, line->elements[i].indent);
    985      dbgPrintf("\n");      dbgPrintf("\n");
    986      struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);      struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
    # Line 1020  static struct grubConfig * readConfig(co Line 1008  static struct grubConfig * readConfig(co
    1008       * This only applies to grub, but that's the only place we       * This only applies to grub, but that's the only place we
    1009       * should find LT_MBMODULE lines anyway.       * should find LT_MBMODULE lines anyway.
    1010       */       */
    1011      struct singleLine * l;      for (struct singleLine *l = entry->lines; l; l = l->next) {
         for (l = entry->lines; l; l = l->next) {  
    1012   if (l->type == LT_HYPER)   if (l->type == LT_HYPER)
    1013      break;      break;
    1014   else if (l->type == LT_KERNEL) {   else if (l->type == LT_KERNEL) {
    # Line 1041  static struct grubConfig * readConfig(co Line 1028  static struct grubConfig * readConfig(co
    1028   } else if (line->type == LT_TITLE && line->numElements > 1) {   } else if (line->type == LT_TITLE && line->numElements > 1) {
    1029      /* make the title a single argument (undoing our parsing) */      /* make the title a single argument (undoing our parsing) */
    1030      len = 0;      len = 0;
    1031      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    1032   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
    1033   len += strlen(line->elements[i].indent);   len += strlen(line->elements[i].indent);
    1034      }      }
    1035      buf = malloc(len + 1);      buf = malloc(len + 1);
    1036      *buf = '\0';      *buf = '\0';
    1037    
    1038      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    1039   strcat(buf, line->elements[i].item);   strcat(buf, line->elements[i].item);
    1040   free(line->elements[i].item);   free(line->elements[i].item);
    1041    
    # Line 1068  static struct grubConfig * readConfig(co Line 1055  static struct grubConfig * readConfig(co
    1055      char *extras;      char *extras;
    1056      char *title;      char *title;
    1057    
    1058      for (i = 1; i < line->numElements; i++) {      for (int i = 1; i < line->numElements; i++) {
    1059   len += strlen(line->elements[i].item);   len += strlen(line->elements[i].item);
    1060   len += strlen(line->elements[i].indent);   len += strlen(line->elements[i].indent);
    1061      }      }
    # Line 1080  static struct grubConfig * readConfig(co Line 1067  static struct grubConfig * readConfig(co
    1067      *extras = '\0';      *extras = '\0';
    1068    
    1069      /* get title. */      /* get title. */
    1070      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
    1071   if (!strcmp(line->elements[i].item, "menuentry"))   if (!strcmp(line->elements[i].item, "menuentry"))
    1072      continue;      continue;
    1073   if (isquote(*line->elements[i].item))   if (isquote(*line->elements[i].item))
    # Line 1100  static struct grubConfig * readConfig(co Line 1087  static struct grubConfig * readConfig(co
    1087    
    1088      /* get extras */      /* get extras */
    1089      int count = 0;      int count = 0;
    1090      for (i = 0; i < line->numElements; i++) {      for (int i = 0; i < line->numElements; i++) {
    1091   if (count >= 2) {   if (count >= 2) {
    1092      strcat(extras, line->elements[i].item);      strcat(extras, line->elements[i].item);
    1093      strcat(extras, line->elements[i].indent);      strcat(extras, line->elements[i].indent);
    # Line 1221  static struct grubConfig * readConfig(co Line 1208  static struct grubConfig * readConfig(co
    1208      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);      cfg->defaultImage = strtol(defaultLine->elements[1].item, &end, 10);
    1209      if (*end) cfg->defaultImage = -1;      if (*end) cfg->defaultImage = -1;
    1210   } else if (defaultLine->numElements >= 2) {   } else if (defaultLine->numElements >= 2) {
    1211      i = 0;      int i = 0;
    1212      while ((entry = findEntryByIndex(cfg, i))) {      while ((entry = findEntryByIndex(cfg, i))) {
    1213   for (line = entry->lines; line; line = line->next)   for (line = entry->lines; line; line = line->next)
    1214      if (line->type == LT_TITLE) break;      if (line->type == LT_TITLE) break;
    # Line 1323  static int writeConfig(struct grubConfig Line 1310  static int writeConfig(struct grubConfig
    1310    
    1311      /* most likely the symlink is relative, so change our      /* most likely the symlink is relative, so change our
    1312         directory to the dir of the symlink */         directory to the dir of the symlink */
    1313              rc = chdir(dirname(strdupa(outName)));              rc = chdir(dirname(outName));
    1314      do {      do {
    1315   buf = alloca(len + 1);   buf = alloca(len + 1);
    1316   rc = readlink(basename(outName), buf, len);   rc = readlink(basename(outName), buf, len);
    # Line 1967  void displayEntry(struct singleEntry * e Line 1954  void displayEntry(struct singleEntry * e
    1954          return;          return;
    1955      }      }
    1956    
    1957      printf("kernel=%s%s\n", prefix, line->elements[1].item);      if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    1958     printf("kernel=%s\n", line->elements[1].item);
    1959        else
    1960     printf("kernel=%s%s\n", prefix, line->elements[1].item);
    1961    
    1962      if (line->numElements >= 3) {      if (line->numElements >= 3) {
    1963   printf("args=\"");   printf("args=\"");
    # Line 2026  void displayEntry(struct singleEntry * e Line 2016  void displayEntry(struct singleEntry * e
    2016      line = getLineByType(LT_INITRD, entry->lines);      line = getLineByType(LT_INITRD, entry->lines);
    2017    
    2018      if (line && line->numElements >= 2) {      if (line && line->numElements >= 2) {
    2019   printf("initrd=%s", prefix);   if (!strncmp(prefix, line->elements[1].item, strlen(prefix)))
    2020        printf("initrd=");
    2021     else
    2022        printf("initrd=%s", prefix);
    2023    
    2024   for (i = 1; i < line->numElements; i++)   for (i = 1; i < line->numElements; i++)
    2025      printf("%s%s", line->elements[i].item, line->elements[i].indent);      printf("%s%s", line->elements[i].item, line->elements[i].indent);
    2026   printf("\n");   printf("\n");
    # Line 2044  void displayEntry(struct singleEntry * e Line 2038  void displayEntry(struct singleEntry * e
    2038      }      }
    2039  }  }
    2040    
    2041    int isSuseSystem(void) {
    2042        const char * path;
    2043        const static char default_path[] = "/etc/SuSE-release";
    2044    
    2045        if ((path = getenv("GRUBBY_SUSE_RELEASE")) == NULL)
    2046     path = default_path;
    2047    
    2048        if (!access(path, R_OK))
    2049     return 1;
    2050        return 0;
    2051    }
    2052    
    2053    int isSuseGrubConf(const char * path) {
    2054        FILE * grubConf;
    2055        char * line = NULL;
    2056        size_t len = 0, res = 0;
    2057    
    2058        grubConf = fopen(path, "r");
    2059        if (!grubConf) {
    2060            dbgPrintf("Could not open SuSE configuration file '%s'\n", path);
    2061     return 0;
    2062        }
    2063    
    2064        while ((res = getline(&line, &len, grubConf)) != -1) {
    2065     if (!strncmp(line, "setup", 5)) {
    2066        fclose(grubConf);
    2067        free(line);
    2068        return 1;
    2069     }
    2070        }
    2071    
    2072        dbgPrintf("SuSE configuration file '%s' does not appear to be valid\n",
    2073          path);
    2074    
    2075        fclose(grubConf);
    2076        free(line);
    2077        return 0;
    2078    }
    2079    
    2080    int suseGrubConfGetLba(const char * path, int * lbaPtr) {
    2081        FILE * grubConf;
    2082        char * line = NULL;
    2083        size_t res = 0, len = 0;
    2084    
    2085        if (!path) return 1;
    2086        if (!lbaPtr) return 1;
    2087    
    2088        grubConf = fopen(path, "r");
    2089        if (!grubConf) return 1;
    2090    
    2091        while ((res = getline(&line, &len, grubConf)) != -1) {
    2092     if (line[res - 1] == '\n')
    2093        line[res - 1] = '\0';
    2094     else if (len > res)
    2095        line[res] = '\0';
    2096     else {
    2097        line = realloc(line, res + 1);
    2098        line[res] = '\0';
    2099     }
    2100    
    2101     if (!strncmp(line, "setup", 5)) {
    2102        if (strstr(line, "--force-lba")) {
    2103            *lbaPtr = 1;
    2104        } else {
    2105            *lbaPtr = 0;
    2106        }
    2107        dbgPrintf("lba: %i\n", *lbaPtr);
    2108        break;
    2109     }
    2110        }
    2111    
    2112        free(line);
    2113        fclose(grubConf);
    2114        return 0;
    2115    }
    2116    
    2117    int suseGrubConfGetInstallDevice(const char * path, char ** devicePtr) {
    2118        FILE * grubConf;
    2119        char * line = NULL;
    2120        size_t res = 0, len = 0;
    2121        char * lastParamPtr = NULL;
    2122        char * secLastParamPtr = NULL;
    2123        char installDeviceNumber = '\0';
    2124        char * bounds = NULL;
    2125    
    2126        if (!path) return 1;
    2127        if (!devicePtr) return 1;
    2128    
    2129        grubConf = fopen(path, "r");
    2130        if (!grubConf) return 1;
    2131    
    2132        while ((res = getline(&line, &len, grubConf)) != -1) {
    2133     if (strncmp(line, "setup", 5))
    2134        continue;
    2135    
    2136     if (line[res - 1] == '\n')
    2137        line[res - 1] = '\0';
    2138     else if (len > res)
    2139        line[res] = '\0';
    2140     else {
    2141        line = realloc(line, res + 1);
    2142        line[res] = '\0';
    2143     }
    2144    
    2145     lastParamPtr = bounds = line + res;
    2146    
    2147     /* Last parameter in grub may be an optional IMAGE_DEVICE */
    2148     while (!isspace(*lastParamPtr))
    2149        lastParamPtr--;
    2150     lastParamPtr++;
    2151    
    2152     secLastParamPtr = lastParamPtr - 2;
    2153     dbgPrintf("lastParamPtr: %s\n", lastParamPtr);
    2154    
    2155     if (lastParamPtr + 3 > bounds) {
    2156        dbgPrintf("lastParamPtr going over boundary");
    2157        fclose(grubConf);
    2158        free(line);
    2159        return 1;
    2160     }
    2161     if (!strncmp(lastParamPtr, "(hd", 3))
    2162        lastParamPtr += 3;
    2163     dbgPrintf("lastParamPtr: %c\n", *lastParamPtr);
    2164    
    2165     /*
    2166     * Second last parameter will decide wether last parameter is
    2167     * an IMAGE_DEVICE or INSTALL_DEVICE
    2168     */
    2169     while (!isspace(*secLastParamPtr))
    2170        secLastParamPtr--;
    2171     secLastParamPtr++;
    2172    
    2173     if (secLastParamPtr + 3 > bounds) {
    2174        dbgPrintf("secLastParamPtr going over boundary");
    2175        fclose(grubConf);
    2176        free(line);
    2177        return 1;
    2178     }
    2179     dbgPrintf("secLastParamPtr: %s\n", secLastParamPtr);
    2180     if (!strncmp(secLastParamPtr, "(hd", 3)) {
    2181        secLastParamPtr += 3;
    2182        dbgPrintf("secLastParamPtr: %c\n", *secLastParamPtr);
    2183        installDeviceNumber = *secLastParamPtr;
    2184     } else {
    2185        installDeviceNumber = *lastParamPtr;
    2186     }
    2187    
    2188     *devicePtr = malloc(6);
    2189     snprintf(*devicePtr, 6, "(hd%c)", installDeviceNumber);
    2190     dbgPrintf("installDeviceNumber: %c\n", installDeviceNumber);
    2191     fclose(grubConf);
    2192     free(line);
    2193     return 0;
    2194        }
    2195    
    2196        free(line);
    2197        fclose(grubConf);
    2198        return 1;
    2199    }
    2200    
    2201    int grubGetBootFromDeviceMap(const char * device,
    2202         char ** bootPtr) {
    2203        FILE * deviceMap;
    2204        char * line = NULL;
    2205        size_t res = 0, len = 0;
    2206        char * devicePtr;
    2207        char * bounds = NULL;
    2208        const char * path;
    2209        const static char default_path[] = "/boot/grub/device.map";
    2210    
    2211        if (!device) return 1;
    2212        if (!bootPtr) return 1;
    2213    
    2214        if ((path = getenv("GRUBBY_GRUB_DEVICE_MAP")) == NULL)
    2215     path = default_path;
    2216    
    2217        dbgPrintf("opening grub device.map file from: %s\n", path);
    2218        deviceMap = fopen(path, "r");
    2219        if (!deviceMap)
    2220     return 1;
    2221    
    2222        while ((res = getline(&line, &len, deviceMap)) != -1) {
    2223            if (!strncmp(line, "#", 1))
    2224        continue;
    2225    
    2226     if (line[res - 1] == '\n')
    2227        line[res - 1] = '\0';
    2228     else if (len > res)
    2229        line[res] = '\0';
    2230     else {
    2231        line = realloc(line, res + 1);
    2232        line[res] = '\0';
    2233     }
    2234    
    2235     devicePtr = line;
    2236     bounds = line + res;
    2237    
    2238     while ((isspace(*line) && ((devicePtr + 1) <= bounds)))
    2239        devicePtr++;
    2240     dbgPrintf("device: %s\n", devicePtr);
    2241    
    2242     if (!strncmp(devicePtr, device, strlen(device))) {
    2243        devicePtr += strlen(device);
    2244        while (isspace(*devicePtr) && ((devicePtr + 1) <= bounds))
    2245            devicePtr++;
    2246    
    2247        *bootPtr = strdup(devicePtr);
    2248        break;
    2249     }
    2250        }
    2251    
    2252        free(line);
    2253        fclose(deviceMap);
    2254        return 0;
    2255    }
    2256    
    2257    int suseGrubConfGetBoot(const char * path, char ** bootPtr) {
    2258        char * grubDevice;
    2259    
    2260        if (suseGrubConfGetInstallDevice(path, &grubDevice))
    2261     dbgPrintf("error looking for grub installation device\n");
    2262        else
    2263     dbgPrintf("grubby installation device: %s\n", grubDevice);
    2264    
    2265        if (grubGetBootFromDeviceMap(grubDevice, bootPtr))
    2266     dbgPrintf("error looking for grub boot device\n");
    2267        else
    2268     dbgPrintf("grubby boot device: %s\n", *bootPtr);
    2269    
    2270        free(grubDevice);
    2271        return 0;
    2272    }
    2273    
    2274    int parseSuseGrubConf(int * lbaPtr, char ** bootPtr) {
    2275        /*
    2276         * This SuSE grub configuration file at this location is not your average
    2277         * grub configuration file, but instead the grub commands used to setup
    2278         * grub on that system.
    2279         */
    2280        const char * path;
    2281        const static char default_path[] = "/etc/grub.conf";
    2282    
    2283        if ((path = getenv("GRUBBY_SUSE_GRUB_CONF")) == NULL)
    2284     path = default_path;
    2285    
    2286        if (!isSuseGrubConf(path)) return 1;
    2287    
    2288        if (lbaPtr) {
    2289            *lbaPtr = 0;
    2290            if (suseGrubConfGetLba(path, lbaPtr))
    2291                return 1;
    2292        }
    2293    
    2294        if (bootPtr) {
    2295            *bootPtr = NULL;
    2296            suseGrubConfGetBoot(path, bootPtr);
    2297        }
    2298    
    2299        return 0;
    2300    }
    2301    
    2302  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {  int parseSysconfigGrub(int * lbaPtr, char ** bootPtr) {
    2303      FILE * in;      FILE * in;
    2304      char buf[1024];      char buf[1024];
    # Line 2092  int parseSysconfigGrub(int * lbaPtr, cha Line 2347  int parseSysconfigGrub(int * lbaPtr, cha
    2347  }  }
    2348    
    2349  void dumpSysconfigGrub(void) {  void dumpSysconfigGrub(void) {
    2350      char * boot;      char * boot = NULL;
    2351      int lba;      int lba;
    2352    
    2353      if (!parseSysconfigGrub(&lba, &boot)) {      if (isSuseSystem()) {
    2354   if (lba) printf("lba\n");          if (parseSuseGrubConf(&lba, &boot)) {
    2355   if (boot) printf("boot=%s\n", boot);      free(boot);
    2356        return;
    2357     }
    2358        } else {
    2359            if (parseSysconfigGrub(&lba, &boot)) {
    2360        free(boot);
    2361        return;
    2362     }
    2363        }
    2364    
    2365        if (lba) printf("lba\n");
    2366        if (boot) {
    2367     printf("boot=%s\n", boot);
    2368     free(boot);
    2369      }      }
    2370  }  }
    2371    
    # Line 2911  int checkForGrub(struct grubConfig * con Line 3179  int checkForGrub(struct grubConfig * con
    3179      int fd;      int fd;
    3180      unsigned char bootSect[512];      unsigned char bootSect[512];
    3181      char * boot;      char * boot;
    3182        int onSuse = isSuseSystem();
    3183    
    3184      if (parseSysconfigGrub(NULL, &boot))  
    3185   return 0;      if (onSuse) {
    3186     if (parseSuseGrubConf(NULL, &boot))
    3187        return 0;
    3188        } else {
    3189     if (parseSysconfigGrub(NULL, &boot))
    3190        return 0;
    3191        }
    3192    
    3193      /* assume grub is not installed -- not an error condition */      /* assume grub is not installed -- not an error condition */
    3194      if (!boot)      if (!boot)
    # Line 2932  int checkForGrub(struct grubConfig * con Line 3207  int checkForGrub(struct grubConfig * con
    3207      }      }
    3208      close(fd);      close(fd);
    3209    
    3210        /* The more elaborate checks do not work on SuSE. The checks done
    3211         * seem to be reasonble (at least for now), so just return success
    3212         */
    3213        if (onSuse)
    3214     return 2;
    3215    
    3216      return checkDeviceBootloader(boot, bootSect);      return checkDeviceBootloader(boot, bootSect);
    3217  }  }
    3218    
    Legend:
    Removed from v.1844  
    changed lines
      Added in v.1852