Magellan Linux

Diff of /trunk/grubby/grubby.c

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

revision 1848 by niro, Mon Jul 2 13:00:11 2012 UTC revision 1849 by niro, Mon Jul 2 13:08:29 2012 UTC
# Line 1954  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 2013  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");

Legend:
Removed from v.1848  
changed lines
  Added in v.1849