Bump version to 2.0.1

.github/workflows/build.yml

@@ -309,7 +309,7 @@ jobs:
           cp -a sysroot/${{ env.PREFIX }}/{include,lib} dep_root
           find dep_root -name '*.dylib' -delete
           find dep_root -name '*.la' -delete
-          gmake -j$(sysctl -n hw.ncpu) TUI=1
+          gmake -j$(sysctl -n hw.ncpu) ROOTFUL=1
           cp src/palera1n palera1n-${{ matrix.os }}-${{ matrix.arch }}
           dsymutil palera1n-${{ matrix.os }}-${{ matrix.arch }}
           strip palera1n-${{ matrix.os }}-${{ matrix.arch }}
@@ -794,7 +794,7 @@ jobs:
           cp -a ${{ env.DESTDIR }}/${{ env.PREFIX }}/{include,lib} dep_root
           find dep_root -name '*.so' -delete
           find dep_root -name '*.la' -delete
-          CC="${{ matrix.triple }}-gcc" make -j$(nproc) TUI=1
+          CC="${{ matrix.triple }}-gcc" make -j$(nproc) ROOTFUL=1
           cp src/palera1n palera1n.release
 
       - name: Seperate debug symbols
@@ -807,7 +807,7 @@ jobs:
       - name: Build palera1n (Development)
         run: |
           CC="${{ matrix.triple }}-gcc" make -j$(nproc) clean
-          CC="${{ matrix.triple }}-gcc" make -j$(nproc) DEV_BUILD=1 TUI=1 ROOTFUL=1
+          CC="${{ matrix.triple }}-gcc" make -j$(nproc) DEV_BUILD=1 ROOTFUL=1
           cp src/palera1n palera1n.development
 
       - name: Prepare artifact

Makefile

@@ -3,7 +3,7 @@ DEP = $(SRC)/dep_root
 STRIP = strip
 CC ?= cc
 CFLAGS += -isystem $(DEP)/include -I$(SRC)/include -I$(SRC) -D_XOPEN_SOURCE=500
-CFLAGS += -Wall -Wextra -Wno-unused-parameter -DPALERAIN_VERSION=\"2.0\" -DHAVE_LIBIMOBILEDEVICE
+CFLAGS += -Wall -Wextra -Wno-unused-parameter -DPALERAIN_VERSION=\"2.0.1\" -DHAVE_LIBIMOBILEDEVICE
 CFLAGS += -Wno-unused-variable -I$(SRC)/src -std=c99 -pedantic-errors -D_C99_SOURCE -D_POSIX_C_SOURCE=200112L
 LIBS += $(DEP)/lib/libimobiledevice-1.0.a $(DEP)/lib/libirecovery-1.0.a $(DEP)/lib/libusbmuxd-2.0.a
 LIBS += $(DEP)/lib/libimobiledevice-glue-1.0.a $(DEP)/lib/libplist-2.0.a -pthread -lm
@@ -59,15 +59,12 @@ ifneq ($(BAKERAIN_DEVELOPE_R),)
 CFLAGS += -DBAKERAIN_DEVELOPE_R="\"$(BAKERAIN_DEVELOPE_R)\""
 endif
 
-BUILD_DATE := $(shell LANG=C date)
 BUILD_NUMBER := $(shell git rev-list --count HEAD)
 BUILD_TAG := $(shell git describe --dirty --tags --abbrev=7)
-BUILD_WHOAMI := $(shell whoami)
 BUILD_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 BUILD_COMMIT := $(shell git rev-parse HEAD)
 
-CFLAGS += -DBUILD_STYLE="\"$(BUILD_STYLE)\"" -DBUILD_DATE="\"$(BUILD_DATE)\""
+CFLAGS += -DBUILD_STYLE="\"$(BUILD_STYLE)\"" -DBUILD_TAG="\"$(BUILD_TAG)\""
-CFLAGS += -DBUILD_WHOAMI="\"$(BUILD_WHOAMI)\"" -DBUILD_TAG="\"$(BUILD_TAG)\""
 CFLAGS += -DBUILD_NUMBER="\"$(BUILD_NUMBER)\"" -DBUILD_BRANCH="\"$(BUILD_BRANCH)\""
 CFLAGS += -DBUILD_COMMIT="\"$(BUILD_COMMIT)\""
 

README.md

@@ -78,12 +78,44 @@ Jailbreak for A8 through A11, T2 devices, on iOS/iPadOS/tvOS 15.0, bridgeOS 5.0
 
 > USB-C port on Apple Silicon Macs *may* require manual unplugging and replugging of the lightning cable after checkm8 exploit. This problem may be solved by connecting via USB hub, though extensions can vary.
 
+## Usage 
+```
+Usage: palera1n [-DEhpvVdsSLRnPI] [-e boot arguments] [-k Pongo image] [-o overlay file] [-r ramdisk file] [-K KPF file] [-i checkra1n file]
+
+	--version				Print version
+	--force-revert				Remove jailbreak
+	-d, --demote				Demote
+	-D, --dfuhelper				Exit after entering DFU
+	-e, --boot-args <boot arguments>	XNU boot arguments
+	-E, --enter-recovery			Enter recovery mode
+	-h, --help				Show this help
+	-i, --override-checkra1n <file>		Override checkra1n
+	-k, --override-pongo <file>		Override Pongo image
+	-K, --override-kpf <file>		Override kernel patchfinder
+	-L, --jbinit-log-to-file		Make jbinit log to /cores/jbinit.log (can be read from sandbox while jailbroken)
+	-n, --exit-recovery			Exit recovery mode
+	-I, --device-info			Print info about the connected device
+	-o, --override-overlay <file>		Override overlay
+	-p, --pongo-shell			Boots to PongoOS shell
+	-P, --pongo-full			Boots to a PongoOS shell with default images already uploaded
+	-r, --override-ramdisk <file>		Override ramdisk
+	-R, --reboot-device			Reboot connected device in normal mode
+	-s, --safe-mode				Enter safe mode
+	-S, --no-colors				Disable colors on the command line
+	-v, --debug-logging			Enable debug logging
+		  This option can be repeated for extra verbosity.
+	-V, --verbose-boot			Verbose boot
+
+Environmental variables:
+	TMPDIR		temporary diretory (path the built-in checkra1n will be extracted to)
+```
+
 ## Installing
 Visit https://palera.in
 
 ## Disclaimers
 We are **NOT** responsible for any data loss, or the result of a device being bricked. When using palera1n, the user should accept responsibility if anything happens to their device during the process.
-- If your device is stuck in recovery, please run futurerestore `--exit-recovery`, or use `irecovery -n`.
+- If your device is stuck in recovery, please run futurerestore `--exit-recovery`, or use `irecovery -n`, or `palera1n -n`.
 - If you're unable to get out of recovery via these methods please restore with iTunes or Finder.
 - palera1n **will not work** in VirtualBox, VMware or any virtual machine that doesn't support PCI passthrough.
 

docs/palera1n.1

@@ -2,7 +2,7 @@
 .\" Copyright (c) 2024 Nick Chan
 .\" SPDX-License-Identifier: MIT
 .\"
-.Dd "30 March 2024"
+.Dd "24 July 2024"
 .Dt palera1n 1
 .Sh NAME
 .Nm palera1n
@@ -155,17 +155,13 @@ Set the effective production fuse to 0, so as to enable hardware debugging featu
 Execute the DFU helper to guide the user into putting the device into DFU mode
 then exit.
 .It Fl e , -boot-args Ar boot arguments
-Specify custom XNU kernel command line. The
+Specify custom XNU kernel command line. Additionally, the
-.Em rootdev=md0
-argument is used by
-.Nm
-and cannot be overriden. Additionally, the
 .Em wdt=-1
 argument is used during fakefs setup.
 .It Fl E , -enter-recovery
 Exit after entering recovery mode.
 .It Fl f , -fakefs
-Proceed in rootful mode. This applies to both full, partial fakefs, as well as realfs.
+Proceed in rootful mode. Despite its name, this applies to both full, partial fakefs, as well as realfs, and it still applies even when trying to force revert.
 .It Fl h , -help
 Prints help text.
 .It Fl i , -checkra1n-file Ar checkra1n file
@@ -183,10 +179,6 @@ command. If in doubt, use
 iOS15 branch or your own fork of it.
 .It Fl l , -rootless
 Proceed in rootless mode. This option is only supported on iOS/iPadOS.
-.It Fl L , -jbinit-log-to-file
-This option is not currently supported and is a no-operation in this version of
-.Nm
-\[char46]
 .It Fl n , -exit-recovery
 Exit recovery mode and exit.
 .It Fl o , -override-overlay Ar overlay file
@@ -241,13 +233,13 @@ is extracted and executed here. When not set, /tmp is used.
 .Sh EXAMPLES
 To (re-)jailbreak in rootless mode:
 .Pp
-.Dl "palera1n"
+.Dl "palera1n -l"
 .Pp
 To setup fakefs for rootful mode:
 .Pp
 .Dl "palera1n -fc"
 .Pp
-After the device has rebooted, follow the following example.
+After the device has rebooted into recovery mode, follow the following example.
 .Pp
 To re-jailbreak in rootful mode:
 .Pp
@@ -304,7 +296,7 @@ option might cause some versions for tvOS to crash and not boot.
 Offical Apple USB-C cables as well as some other USB-C cables cannot be used to enter DFU mode.
 USB-A cable with male USB-C to female USB-A adapter works fine.
 .Sh POST INSTALLATION (iOS/iPadOS)
-The palera1n loader app will take up to 30 seconds to appear on the homescreen after the
+The palera1n loader app will take up to 1 minute to appear on the homescreen after the
 device has booted. If it does not appear, you can try using the shortcut:
 .Pp
 .Lk https://www.icloud.com/shortcuts/8cd5f489c8854ee0ab9ee38f2e62f87d
@@ -332,7 +324,7 @@ loader app to install additional jailbreak files.
 
 .Bl -tag -width "/var/jb/Library/LaunchDaemons"
 .It Pa /cores
-The location of the temporary filesystem where jailbreak files are stash during boot.
+The location of the temporary filesystem where jailbreak files are stashed during boot.
 .It Pa /Library/LaunchDaemons
 The directory where jailbreak-specific
 .Xr launchd.plist 5
@@ -358,8 +350,6 @@ may crash if the machine it is running on:
 .Pp
 The exploit may also work less reliably on some hosts, like AMD desktops, or some MediaTek devices.
 .Pp
-The device may randomly crash and reboot due to launchd using too much memory.
-.Pp
 The built-in SSH server might be not accessible with password after bootstrapping rootful,
 since the bootstrap uses a custom crypt() function that is not supported
 by the built-in SSH server.

include/palerain.h

@@ -72,7 +72,7 @@ usb_ret_t USBBulkUpload(usb_device_handle_t handle, void *data, uint32_t len);
 #endif
 
 #ifndef PALERAIN_VERSION
-#define PALERAIN_VERSION "2.0"
+#define PALERAIN_VERSION "2.0.1"
 #endif
 
 #if defined(__APPLE__)

src/optparse.c

@@ -57,8 +57,8 @@ static struct option longopts[] = {
 #endif
 #ifdef TUI
 	{"tui", no_argument, NULL, 't'},
-	{"cli", no_argument, NULL, palerain_option_case_cli},
 #endif
+	{"cli", no_argument, NULL, palerain_option_case_cli},
 	{NULL, 0, NULL, 0}
 };
 
@@ -78,7 +78,7 @@ static int usage(int e, char* prog_name)
 #endif
 			"] [-e boot arguments] [-k Pongo image] [-o overlay file] [-r ramdisk file] [-K KPF file] [-i checkra1n file]\n"
 			"Copyright (C) 2024, palera1n team, All Rights Reserved.\n\n"
-			"iOS/iPadOS/tvOS 15.0-17.5, bridgeOS 5.0-8.3 arm64 jailbreaking tool\n\n"
+			"iOS/iPadOS/tvOS 15.0-18.0, bridgeOS 5.0-9.0 arm64 jailbreaking tool\n\n"
 			"\t--version\t\t\t\tPrint version\n"
 			"\t--force-revert\t\t\t\tRemove jailbreak\n"
 #ifdef DEV_BUILD
@@ -181,10 +181,7 @@ int optparse(int argc, char* argv[]) {
 #endif
 			break;
 		case 'e':
-			if (strstr(optarg, "rootdev=") != NULL) {
+			if (strlen(optarg) > (sizeof(xargs_cmd) - 0x20)) {
-				LOG(LOG_FATAL, "The boot arg rootdev= is already used by palera1n and cannot be overriden");
-				return -1;
-			} else if (strlen(optarg) > (sizeof(xargs_cmd) - 0x20)) {
                 LOG(LOG_FATAL, "Boot arguments too long");
                 return -1;
             }
@@ -313,10 +310,10 @@ int optparse(int argc, char* argv[]) {
 		case 't':
 			palerain_flags |= palerain_option_tui;
 			break;
+#endif
 		case palerain_option_case_cli:
 			palerain_flags |= palerain_option_cli;
 			break;
-#endif
 #ifdef DEV_BUILD
 		case '1':
 			palerain_flags |= palerain_option_test1;
@@ -351,10 +348,8 @@ int optparse(int argc, char* argv[]) {
 		printf(
 			"palera1n " PALERAIN_VERSION "\n"
 			BUILD_COMMIT " " BUILD_NUMBER " (" BUILD_BRANCH ")\n\n"
-			"Build date: " BUILD_DATE "\n"
 			"Build style: " BUILD_STYLE "\n"
 			"Build tag: " BUILD_TAG "\n"
-			"Built by: " BUILD_WHOAMI "\n"
 #ifdef USE_LIBUSB
 			"USB backend: libusb\n"
 #else