--- trunk/grubby/grubby.c	2012/04/16 17:48:10	1801
+++ trunk/grubby/grubby.c	2012/07/02 12:49:27	1841
@@ -901,13 +901,11 @@
 					break;
 				}
 
-				free(line->elements[i].indent);
+				line->elements[i + 1].indent = line->elements[i].indent;
 				line->elements[i].indent = strdup(indent);
 				*p++ = '\0';
 				i++;
 				line->elements[i].item = strdup(p);
-				line->elements[i].indent = strdup("");
-				p = line->elements[i].item;
 			}
 		    }
 		}
@@ -995,7 +993,7 @@
 	    dbgPrintf("found 'set' command (%d elements): ", line->numElements);
 	    dbgPrintf("%s", line->indent);
 	    for (i = 0; i < line->numElements; i++)
-		dbgPrintf("%s\"%s\"", line->elements[i].indent, line->elements[i].item);
+		dbgPrintf("\"%s\"%s", line->elements[i].item, line->elements[i].indent);
 	    dbgPrintf("\n");
 	    struct keywordTypes *kwType = getKeywordByType(LT_DEFAULT, cfi);
 	    if (kwType && line->numElements == 3 &&
@@ -1103,7 +1101,7 @@
 	    /* get extras */
 	    int count = 0;
 	    for (i = 0; i < line->numElements; i++) {
-		if (count == 2) {
+		if (count >= 2) {
 		    strcat(extras, line->elements[i].item);
 		    strcat(extras, line->elements[i].indent);
 		}
@@ -1463,6 +1461,8 @@
     buf[rc] = '\0';
     chptr = buf;
 
+    char *foundanswer = NULL;
+
     while (chptr && chptr != buf+rc) {
         devname = chptr;
 
@@ -1490,13 +1490,8 @@
          * for '/' obviously.
          */
         if (*(++chptr) == '/' && *(++chptr) == ' ') {
-            /*
-             * Move back 2, which is the first space after the device name, set
-             * it to \0 so strdup will just get the devicename.
-             */
-            chptr -= 2;
-            *chptr = '\0';
-            return strdup(devname);
+            /* remember the last / entry in mtab */
+           foundanswer = devname;
         }
 
         /* Next line */
@@ -1505,6 +1500,13 @@
             chptr++;
     }
 
+    /* Return the last / entry found */
+    if (foundanswer) {
+        chptr = strchr(foundanswer, ' ');
+        *chptr = '\0';
+        return strdup(foundanswer);
+    }
+
     return NULL;
 }
 
@@ -3587,20 +3589,20 @@
     }
 
     if (!cfi) {
+        if (grub2FindConfig(&grub2ConfigType))
+	    cfi = &grub2ConfigType;
+	else
       #ifdef __ia64__
-	cfi = &eliloConfigType;
+	    cfi = &eliloConfigType;
       #elif __powerpc__
-	cfi = &yabootConfigType;
+	    cfi = &yabootConfigType;
       #elif __sparc__
-        cfi = &siloConfigType;
+            cfi = &siloConfigType;
       #elif __s390__
-        cfi = &ziplConfigType;
+            cfi = &ziplConfigType;
       #elif __s390x__
-        cfi = &ziplConfigtype;
+            cfi = &ziplConfigtype;
       #else
-        if (grub2FindConfig(&grub2ConfigType))
-	    cfi = &grub2ConfigType;
-	else
 	    cfi = &grubConfigType;
       #endif
     }