disabled bbupdate by default

README.markdown

@@ -90,7 +90,7 @@ after using xpwn (or any other pwnage-based utility). This is important, since
 that's how the jailbreak actually occurs.
 
 	./ipsw <input.ipsw> <output.ipsw> [-b <bootimage.png>] [-nowipe] \
-		[-nobbupdate] [-s <disk0s1 size>]  [-r <recoveryimage.png>] \
+		[-bbupdate] [-s <disk0s1 size>]  [-r <recoveryimage.png>] \
 		[-memory] [-e "<action to exclude>"] \
 		[[-unlock] [-use39] [-use46] [-cleanup] \
 		-3 <bootloader 3.9 file> -4 <bootloader 4.6 file>] \
@@ -115,7 +115,8 @@ used whenever possible (no longer the default).
 -nowipe disables Apple's wiping of the NAND (user data), before proceeding
 with the restore. This allows the restore to happen much, much more quickly.
 
--nobbupdate tells the restore ramdisk not to attempt to upgrade your baseband.
+-bbupdate tells the restore ramdisk to attempt to upgrade your baseband. This
+is disabled by default for unlock safety reasons.
 
 -unlock, -use39, -use46, -cleanup, -3, and -4 are valid only if you merge the
 BootNeuter package. These provide instructions to BootNeuter (which provides

ipsw-patch/main.c

@@ -114,7 +114,7 @@ int main(int argc, char* argv[]) {
 	char use39 = FALSE;
 	char use46 = FALSE;
 	char doBootNeuter = FALSE;
-	char updateBB = TRUE;
+	char updateBB = FALSE;
 	char useMemory = FALSE;
 
 	unsigned int key[16];
@@ -124,7 +124,7 @@ int main(int argc, char* argv[]) {
 	unsigned int* pIV = NULL;
 
 	if(argc < 3) {
-		XLOG(0, "usage %s <input.ipsw> <target.ipsw> [-b <bootimage.png>] [-r <recoveryimage.png>] [-s <system partition size>] [-memory] [-nobbupdate] [-nowipe] [-e \"<action to exclude>\"] [[-unlock] [-use39] [-use46] [-cleanup] -3 <bootloader 3.9 file> -4 <bootloader 4.6 file>] <package1.tar> <package2.tar>...\n", argv[0]);
+		XLOG(0, "usage %s <input.ipsw> <target.ipsw> [-b <bootimage.png>] [-r <recoveryimage.png>] [-s <system partition size>] [-memory] [-bbupdate] [-nowipe] [-e \"<action to exclude>\"] [[-unlock] [-use39] [-use46] [-cleanup] -3 <bootloader 3.9 file> -4 <bootloader 4.6 file>] <package1.tar> <package2.tar>...\n", argv[0]);
 		return 0;
 	}
 
@@ -156,8 +156,8 @@ int main(int argc, char* argv[]) {
 			continue;
 		}
 
-		if(strcmp(argv[i], "-nobbupdate") == 0) {
-			updateBB = FALSE;
+		if(strcmp(argv[i], "-bbupdate") == 0) {
+			updateBB = TRUE;
 			continue;
 		}