Index: trunk/i386/libsaio/stringTable.c
===================================================================
--- trunk/i386/libsaio/stringTable.c	(revision 1709)
+++ trunk/i386/libsaio/stringTable.c	(revision 1710)
@@ -498,7 +498,7 @@
 
   ret = getValueForConfigTableKey(config, key, val, size);
 
-  // Try to find alternate keys in bootInfo->overrideConfig
+  // Try to find alternate keys in bootInfo->chameleonConfig (if config can be overriden)
   // and prefer its values with the exceptions for
   // "Kernel"="mach_kernel" and "Kernel Flags"="".
 
@@ -635,13 +635,15 @@
 			sysConfigValid = true;	
 			ret=0;
 			
-			// enable canOverride flag
-			config->canOverride = true;
-
 			break;
 		}
 	}
+
 	if(ret == -1) ret = loadHelperConfig(config);
+
+	// Always enable canOverride flag (for SystemConfig)
+	config->canOverride = true;
+
 	return ret;
 }
 
Index: trunk/i386/boot2/options.c
===================================================================
--- trunk/i386/boot2/options.c	(revision 1709)
+++ trunk/i386/boot2/options.c	(revision 1710)
@@ -1214,7 +1214,7 @@
     cntRemaining = BOOT_STRING_LEN - 2;  // save 1 for NULL, 1 for space
     argP = bootArgs->CommandLine;
 
-    // Get config table kernel flags, if not ignored.
+	// Get config kernel flags, if not ignored.
     if (getValueForBootKey(cp, kIgnoreBootFileFlag, &val, &cnt) ||
             !getValueForKey( kKernelFlagsKey, &val, &cnt, &bootInfo->bootConfig )) {
         val = "";