Index: trunk/i386/boot2/boot.h
===================================================================
--- trunk/i386/boot2/boot.h	(revision 375)
+++ trunk/i386/boot2/boot.h	(revision 376)
@@ -99,7 +99,6 @@
  */
 #define kVerboseModeFlag	"-v"
 #define kSafeModeFlag		"-x"
-#define kOldSafeModeFlag	"-f"
 #define kIgnoreBootFileFlag	"-F"
 #define kSingleUserModeFlag	"-s"
 #define k32BitModeFlag		"-x32"
Index: trunk/i386/boot2/options.c
===================================================================
--- trunk/i386/boot2/options.c	(revision 375)
+++ trunk/i386/boot2/options.c	(revision 376)
@@ -442,7 +442,7 @@
 						gVerboseMode = false;
 						gBootMode = kBootModeNormal;
 						*gBootArgsPtr++ = '-';
-						*gBootArgsPtr++ = 'f';
+						*gBootArgsPtr++ = 'x';
 						break;
 						
 					case BOOT_SINGLEUSER:
@@ -1305,24 +1305,20 @@
     strncpy(&argP[cnt], cp, userCnt);
     argP[cnt+userCnt] = '\0';
 
-    if(!shouldboot)
-    {
-    	gVerboseMode = getValueForKey( kVerboseModeFlag, &val, &cnt, &bootInfo->bootConfig ) ||
-            getValueForKey( kSingleUserModeFlag, &val, &cnt, &bootInfo->bootConfig );
+	if(!shouldboot)
+	{
+		gVerboseMode = getValueForKey( kVerboseModeFlag, &val, &cnt, &bootInfo->bootConfig ) ||
+			getValueForKey( kSingleUserModeFlag, &val, &cnt, &bootInfo->bootConfig );
+		
+		gBootMode = ( getValueForKey( kSafeModeFlag, &val, &cnt, &bootInfo->bootConfig ) ) ?
+			kBootModeSafe : kBootModeNormal;
+	}
 
-      gBootMode = ( getValueForKey( kSafeModeFlag, &val, &cnt, &bootInfo->bootConfig ) ) ?
-	    kBootModeSafe : kBootModeNormal;
+	if ( getValueForKey( kMKextCacheKey, &val, &cnt, &bootInfo->bootConfig ) )
+	{
+		strlcpy(gMKextName, val, cnt + 1);
+	}
 
-    	if ( getValueForKey( kOldSafeModeFlag, &val, &cnt, &bootInfo->bootConfig ) ) {
-        	gBootMode = kBootModeSafe;
-   	}
-
-   	if ( getValueForKey( kMKextCacheKey, &val, &cnt, &bootInfo->bootConfig ) ) {
-        	strlcpy(gMKextName, val, cnt + 1);
-    	}
-
-    }
-	 
     free(configKernelFlags);
     free(valueBuffer);