Bump version

This reverts commit 1670c26313.

.github/ISSUE_TEMPLATE/problem.yml

@@ -2,8 +2,10 @@ name: Create Issue
 description: Ask help for palera1n regarding support or generally how it works! 
 labels: [palera1n]
 assignees:
-  - ssalggnikool
-  - asdfugil
+  - khcrysalis
+  - elliessurviving
+  - hg13bs
+  - afastaudir8
 body:
   - type: input
     id: device

.github/workflows/build.yml

@@ -76,6 +76,11 @@ jobs:
     env:
       MBEDTLS_VERSION: 3.5.2
       READLINE_VERSION: 8.2
+      LIBIMOBILEDEVICE_COMMIT: ed0d66d0341562731bb19928dfe48155509fa7a7
+      LIBIRECOVERY_COMMIT: 7ce02c347b7c26e59498e6af31c9da51018d0fa1
+      LIBIMOBILEDEVICE_GLUE_COMMIT: 362f7848ac89b74d9dd113b38b51ecb601f76094
+      LIBPLIST_COMMIT: 2117b8fdb6b4096455bd2041a63e59a028120136
+      LIBUSBMUXD_COMMIT: a7f0543fb1ecb20ac7121c0fd77297200e0e43fc
 
     steps:
       - name: Checkout
@@ -95,20 +100,6 @@ jobs:
         run: |
           echo "SDK=$(xcrun -sdk ${{ matrix.os }} --show-sdk-path)" >> $GITHUB_ENV
 
-      - name: Download dependencies (source code)
-        run: |
-          curl -LOOOOOO \
-            https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${{ env.MBEDTLS_VERSION }}.tar.gz \
-            https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz
-
-          tar -xf v${{ env.MBEDTLS_VERSION }}.tar.gz
-          tar -xf readline-${{ env.READLINE_VERSION }}.tar.gz
-          git clone --depth=1 https://github.com/libimobiledevice/libplist
-          git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice-glue
-          git clone --depth=1 https://github.com/libimobiledevice/libirecovery
-          git clone --depth=1 https://github.com/libimobiledevice/libusbmuxd
-          git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice
-
       - name: Select correct Xcode
         run: |
           sudo xcode-select -s /Applications/Xcode_14.2.app
@@ -131,8 +122,6 @@ jobs:
           echo "CXXFLAGS_FOR_BUILD=-stdlib=libc++ -arch $(uname -m) -isysroot $(xcrun -sdk macosx --show-sdk-path) -Os" >> $GITHUB_ENV
           echo "CPPFLAGS_FOR_BUILD=-arch $(uname -m) -isysroot $(xcrun -sdk macosx --show-sdk-path) -Wno-error-implicit-function-declaration -Os" >> $GITHUB_ENV
           echo "LDFLAGS_FOR_BUILD=-Wl,-dead_strip" >> $GITHUB_ENV
-          mkdir -p $(pwd)/sysroot/usr/local/lib
-          ln -sf $(pwd)/sysroot/usr/local/lib{,64}
 
       - name: Prepare iPhoneOS environment
         if: matrix.os == 'iphoneos'
@@ -173,7 +162,59 @@ jobs:
           gsed -E /'__API_UNAVAILABLE'/d < ${TARGET_SYSROOT}/usr/include/pthread.h > sysroot/usr/local/include/pthread.h
           gsed -i -E s/'__API_UNAVAILABLE\(.*\)'// sysroot/usr/local/include/IOKit/IOKitLib.h
 
+      - name: Check dependencies cache
+        run: |
+          echo "target: ${{ matrix.os }}-${{ matrix.arch }}" > cache.txt
+          echo "mbedtls ${{ env.MBEDTLS_VERSION }}" >> cache.txt
+          echo "readline: ${{ env.READLINE_VERSION }}" >> cache.txt
+          echo "libimobiledevice: ${{ env.LIBIMOBILEDEVICE_COMMIT }}" >> cache.txt
+          echo "libirecovery: ${{ env.LIBIRECOVERY_COMMIT }}" >> cache.txt
+          echo "libimobiledevice-glue: ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }}" >> cache.txt
+          echo "libplist: ${{ env.LIBPLIST_COMMIT }}" >> cache.txt
+          echo "libusbmuxd: ${{ env.LIBUSBMUXD_COMMIT }}" >> cache.txt
+          echo "cc: $($(xcrun --find cc) --version)" >> cache.txt
+          echo "CACHE_TXT_CHECKSUM=sysroot-$(shasum -a 512 cache.txt | cut -d' ' -f1)" >> $GITHUB_ENV
+
+      - name: Download cached sysroot
+        id: sysroot_cache
+        uses: actions/cache@v3
+        with:
+          path: sysroot-${{ env.CACHE_TXT_CHECKSUM }}.txz
+          key: sysroot-${{ env.CACHE_TXT_CHECKSUM }}
+
+      - name: Extract cached sysroot
+        if: steps.sysroot_cache.outputs.cache-hit == 'true'
+        run: |
+          xz -dcT0 sysroot-${{ env.CACHE_TXT_CHECKSUM }}.txz | tar -x
+
+      - name: Setup sysroot
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
+        run: |
+          mkdir -p $(pwd)/sysroot/usr/local/lib
+          ln -sf $(pwd)/sysroot/usr/local/lib{,64}
+
+      - name: Download dependencies (source code)
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
+        run: |
+          curl -LOOOOOO \
+            https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${{ env.MBEDTLS_VERSION }}.tar.gz \
+            https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz
+
+          tar -xf v${{ env.MBEDTLS_VERSION }}.tar.gz
+          tar -xf readline-${{ env.READLINE_VERSION }}.tar.gz
+          git clone --depth=1 https://github.com/libimobiledevice/libplist
+          git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice-glue
+          git clone --depth=1 https://github.com/libimobiledevice/libirecovery
+          git clone --depth=1 https://github.com/libimobiledevice/libusbmuxd
+          git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice
+          cd libplist && git fetch origin ${{ env.LIBPLIST_COMMIT }} && git reset --hard ${{ env.LIBPLIST_COMMIT }} && cd ..
+          cd libirecovery && git fetch origin ${{ env.LIBIRECOVERY_COMMIT }} && git reset --hard ${{ env.LIBIRECOVERY_COMMIT }} && cd ..
+          cd libimobiledevice-glue && git fetch origin ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }} && git reset --hard ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }} && cd ..
+          cd libimobiledevice && git fetch origin ${{ env.LIBIMOBILEDEVICE_COMMIT }} && git reset --hard ${{ env.LIBIMOBILEDEVICE_COMMIT }} && cd ..
+          cd libusbmuxd && git fetch origin ${{ env.LIBUSBMUXD_COMMIT }} && git reset --hard ${{ env.LIBUSBMUXD_COMMIT }} && cd ..
+
       - name: Build Mbed TLS
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd mbedtls-${{ env.MBEDTLS_VERSION }}
           cat ../patches/mbedtls/0001-Allow-empty-x509-cert-issuer.patch | patch -sN -d . -p1
@@ -198,6 +239,7 @@ jobs:
           cd ..
 
       - name: Build readline
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd readline-${{ env.READLINE_VERSION }}
           CC=clang CXX=clang++ ./configure ${{ env.CONFIGURE_ARGS }} ac_cv_type_sig_atomic_t=no
@@ -206,6 +248,7 @@ jobs:
           cd ..
 
       - name: Build libplist
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd libplist
           autoreconf -fiv
@@ -215,6 +258,7 @@ jobs:
           cd ..
 
       - name: Build libimobiledevice-glue
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd libimobiledevice-glue
           autoreconf -fiv
@@ -224,6 +268,7 @@ jobs:
           cd ..
 
       - name: Build libirecovery
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           sudo cp -a sysroot/usr/local/* /usr/local
           cd libirecovery
@@ -239,6 +284,7 @@ jobs:
           cd ..
 
       - name: Build libusbmuxd
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd libusbmuxd
           autoreconf -fiv
@@ -248,10 +294,11 @@ jobs:
           cd ..
 
       - name: Build libimobiledevice
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd libimobiledevice
           autoreconf -fiv
-          ./configure ${{ env.CONFIGURE_ARGS }} --with-mbedtls --enable-debug
+          ./configure ${{ env.CONFIGURE_ARGS }} --with-mbedtls --disable-debug --disable-wireless-pairing
           echo -e 'all:\ninstall:' > tools/Makefile
           gmake -j$(sysctl -n hw.ncpu)
           gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }}
@@ -262,15 +309,15 @@ 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 }}
 
       - name: Build palera1n (Development)
         run: |
-          CC="${{ matrix.triple }}-gcc" gmake -j$(sysctl -n hw.ncpu) clean
-          CC="${{ matrix.triple }}-gcc" gmake -j$(sysctl -n hw.ncpu) DEV_BUILD=1 TUI=1 ROOTFUL=1
+          gmake -j$(sysctl -n hw.ncpu) clean
+          gmake -j$(sysctl -n hw.ncpu) DEV_BUILD=1 TUI=1 ROOTFUL=1
           cp src/palera1n palera1n-${{ matrix.os }}-${{ matrix.arch }}.development
 
       - name: Prepare artifact
@@ -324,7 +371,12 @@ jobs:
           name: palera1n-${{ matrix.os }}-${{ matrix.arch }}.dSYM
           path: palera1n-${{ matrix.os }}-${{ matrix.arch }}.dSYM
           retention-days: 1
-      
+
+      - name: Generate cached sysroot archive
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
+        run: |
+          tar -c sysroot | xz -zce9T 0 > sysroot-${{ env.CACHE_TXT_CHECKSUM }}.txz
+
   darwin-dist:
     if: ${{ github.event_name != 'pull_request' }}
     runs-on: macos-latest
@@ -478,9 +530,15 @@ jobs:
     runs-on: ubuntu-latest
     env:
       MBEDTLS_VERSION: 3.5.2
-      LIBUSB_VERSION: 1.0.26
+      LIBUSB_VERSION: 1.0.27
       READLINE_VERSION: 8.2
       GPM_VERSION: 1.20.7
+      LIBIMOBILEDEVICE_COMMIT: ed0d66d0341562731bb19928dfe48155509fa7a7
+      LIBIRECOVERY_COMMIT: 7ce02c347b7c26e59498e6af31c9da51018d0fa1
+      LIBIMOBILEDEVICE_GLUE_COMMIT: 362f7848ac89b74d9dd113b38b51ecb601f76094
+      USBMUXD_COMMIT: bc0b91ca856811f4393318dc83db6dc3c1ac326d
+      LIBPLIST_COMMIT: 2117b8fdb6b4096455bd2041a63e59a028120136
+      LIBUSBMUXD_COMMIT: a7f0543fb1ecb20ac7121c0fd77297200e0e43fc
 
     steps:
       - name: Checkout
@@ -543,10 +601,41 @@ jobs:
           echo "PREFIX=/usr/local" >> $GITHUB_ENV
           echo "CONFIGURE_ARGS=--build=x86_64-linux-gnu --host=${{ matrix.triple }} --prefix=/usr/local --disable-shared --enable-static" >> $GITHUB_ENV
           echo "CROSS_COMPILE=${{ matrix.triple }}-" >> $GITHUB_ENV
+
+      - name: Check dependencies cache
+        run: |
+          echo "target: ${{ matrix.triple }}" > cache.txt
+          echo "mbedtls ${{ env.MBEDTLS_VERSION }}" >> cache.txt
+          echo "readline: ${{ env.READLINE_VERSION }}" >> cache.txt
+          echo "libimobiledevice: ${{ env.LIBIMOBILEDEVICE_COMMIT }}" >> cache.txt
+          echo "libirecovery: ${{ env.LIBIRECOVERY_COMMIT }}" >> cache.txt
+          echo "libimobiledevice-glue: ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }}" >> cache.txt
+          echo "libplist: ${{ env.LIBPLIST_COMMIT }}" >> cache.txt
+          echo "libusbmuxd: ${{ env.LIBUSBMUXD_COMMIT }}" >> cache.txt
+          echo "usbmuxd: ${{ env.USBMUXD_COMMIT }}" >> cache.txt
+          echo "cc: $(${{ env.CROSS_COMPILE }}gcc --version)" >> cache.txt
+          echo "CACHE_TXT_CHECKSUM=sysroot-$(sha512sum cache.txt | cut -d' ' -f1)" >> $GITHUB_ENV
+
+      - name: Download cached sysroot
+        id: sysroot_cache
+        uses: actions/cache@v3
+        with:
+          path: sysroot-${{ env.CACHE_TXT_CHECKSUM }}.txz
+          key: sysroot-${{ env.CACHE_TXT_CHECKSUM }}
+
+      - name: Extract cached sysroot
+        if: steps.sysroot_cache.outputs.cache-hit == 'true'
+        run: |
+          xz -dcT0 sysroot-${{ env.CACHE_TXT_CHECKSUM }}.txz | tar -x
+
+      - name: Setup sysroot
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
+        run: |
           mkdir -p $(pwd)/sysroot/usr/local/lib
           ln -sf $(pwd)/sysroot/usr/local/lib{,64}
 
       - name: Download dependencies (source code)
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           curl -LOOOOOOO \
             https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${{ env.MBEDTLS_VERSION }}.tar.gz \
@@ -564,8 +653,15 @@ jobs:
           git clone --depth=1 https://github.com/libimobiledevice/libusbmuxd
           git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice
           git clone --depth=1 https://github.com/libimobiledevice/usbmuxd
+          cd libplist && git fetch origin ${{ env.LIBPLIST_COMMIT }} && git reset --hard ${{ env.LIBPLIST_COMMIT }} && cd ..
+          cd libirecovery && git fetch origin ${{ env.LIBIRECOVERY_COMMIT }} && git reset --hard ${{ env.LIBIRECOVERY_COMMIT }} && cd ..
+          cd libimobiledevice-glue && git fetch origin ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }} && git reset --hard ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }} && cd ..
+          cd usbmuxd && git fetch origin ${{ env.USBMUXD_COMMIT }} && git reset --hard ${{ env.USBMUXD_COMMIT }} && cd ..
+          cd libimobiledevice && git fetch origin ${{ env.LIBIMOBILEDEVICE_COMMIT }} && git reset --hard ${{ env.LIBIMOBILEDEVICE_COMMIT }} && cd ..
+          cd libusbmuxd && git fetch origin ${{ env.LIBUSBMUXD_COMMIT }} && git reset --hard ${{ env.LIBUSBMUXD_COMMIT }} && cd ..
 
       - name: Build Mbed TLS
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd mbedtls-${{ env.MBEDTLS_VERSION }}
           cat ../patches/mbedtls/0001-Allow-empty-x509-cert-issuer.patch | patch -sN -d . -p1
@@ -590,6 +686,7 @@ jobs:
           cd ..
 
       - name: Build libusb
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd libusb-${{ env.LIBUSB_VERSION }}
           ./configure ${{ env.CONFIGURE_ARGS }} --disable-udev
@@ -598,6 +695,7 @@ jobs:
           cd ..
 
       - name: Build readline
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd readline-${{ env.READLINE_VERSION }}
           ./configure ${{ env.CONFIGURE_ARGS }}
@@ -606,6 +704,7 @@ jobs:
           cd ..
 
       - name: Build GPM
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd gpm-${{ env.GPM_VERSION }}
           cat ../patches/gpm/*.patch | patch -sN -d . -p1
@@ -617,6 +716,7 @@ jobs:
           cd ..
 
       - name: Build libplist
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd libplist
           autoreconf -fiv
@@ -626,6 +726,7 @@ jobs:
           cd ..
 
       - name: Build libimobiledevice-glue
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd libimobiledevice-glue
           autoreconf -fiv
@@ -635,6 +736,7 @@ jobs:
           cd ..
 
       - name: Build libirecovery (sorta)
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           sudo mv /usr/local /usr/local.bak
           sudo ln -s ${{ env.DESTDIR }}${{ env.PREFIX }} /usr/local
@@ -648,6 +750,7 @@ jobs:
           cd ..
 
       - name: Build libusbmuxd
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd libusbmuxd
           autoreconf -fiv
@@ -657,10 +760,11 @@ jobs:
           cd ..
 
       - name: Build libimobiledevice
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd libimobiledevice
           autoreconf -fiv
-          ./configure ${{ env.CONFIGURE_ARGS }} --with-mbedtls --enable-debug
+          ./configure ${{ env.CONFIGURE_ARGS }} --with-mbedtls --disable-debug --disable-wireless-pairing
           echo -e 'all:\ninstall:' > tools/Makefile
           make -j$(nproc)
           make -j$(nproc) install DESTDIR=${{ env.DESTDIR }}
@@ -669,6 +773,7 @@ jobs:
           sudo mv /usr/local.bak /usr/local
 
       - name: Build usbmuxd
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
         run: |
           cd usbmuxd
           autoreconf -fiv
@@ -689,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
@@ -702,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
@@ -767,6 +872,11 @@ jobs:
           localDir: 'usbmuxd-static/'
           remoteDir: "/palera1n/artifacts/usbmuxd-static"
 
+      - name: Generate cached sysroot archive
+        if: steps.sysroot_cache.outputs.cache-hit != 'true'
+        run: |
+          tar -c sysroot | xz -zce9T 0 > sysroot-${{ env.CACHE_TXT_CHECKSUM }}.txz
+
   finish-build:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}

.gitignore

@@ -4,6 +4,7 @@ dep_root/**
 !contrib/.keep
 contrib/
 *.o
+dep_root*.tgz
 .vscode
 checkra1n*
 payload.c

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.2\" -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_WHOAMI="\"$(BUILD_WHOAMI)\"" -DBUILD_TAG="\"$(BUILD_TAG)\""
+CFLAGS += -DBUILD_STYLE="\"$(BUILD_STYLE)\"" -DBUILD_TAG="\"$(BUILD_TAG)\""
 CFLAGS += -DBUILD_NUMBER="\"$(BUILD_NUMBER)\"" -DBUILD_BRANCH="\"$(BUILD_BRANCH)\""
 CFLAGS += -DBUILD_COMMIT="\"$(BUILD_COMMIT)\""
 

README.md

@@ -15,9 +15,6 @@ Jailbreak for A8 through A11, T2 devices, on iOS/iPadOS/tvOS 15.0, bridgeOS 5.0
 
 ## Device Support
 
-> [!NOTE]  
-> Apple TV & iBridge support are not currently in the beta releases of palera1n, ETA s0n
-
 <!--- Mobile --->
 
 | iPhone(s)                 | iPad(s)                        		| iPod(s)   					| Apple TV(s) 					|
@@ -30,6 +27,8 @@ Jailbreak for A8 through A11, T2 devices, on iOS/iPadOS/tvOS 15.0, bridgeOS 5.0
 | iPhone 8                  | iPad Pro (12.9") (1st generation)		|								|								|
 | iPhone 8 Plus             | iPad Pro (10.5")						|								|								|
 | iPhone X                  | iPad Pro (12.9") (2nd generation)		|								|								|
+|                           | iPad Air 2		|								|								|
+
 
 > Note that on `A11` (iPhone X, 8, 8 Plus), **you must disable your passcode while in the jailbroken state** (on iOS 16, you need to **reset your device** before proceeding with palera1n).
 
@@ -76,12 +75,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.
 
@@ -94,3 +125,9 @@ Make sure you're following the guides provided [here](https://palera.in), also w
 - Panic logs, if panicked then send latest `panic-full` log from your device.
 
 Create an issue here: https://github.com/palera1n/palera1n/issues/new/choose
+
+## Credits
+
+[All credits for palera1n can be found here](https://palera.in/)
+
+If proper credit isn't shown please message us or create an issue.

docs/palera1n.1

@@ -2,11 +2,11 @@
 .\" Copyright (c) 2024 Nick Chan
 .\" SPDX-License-Identifier: MIT
 .\"
-.Dd "30 March 2024"
+.Dd "24 July 2024"
 .Dt palera1n 1
 .Sh NAME
 .Nm palera1n
-.Nd arm64 iOS/iPadOS/tvOS 15.0-17.5, bridgeOS 5.0-8.3 jailbreaking tool
+.Nd arm64 iOS/iPadOS/tvOS 15.0-18.1, bridgeOS 5.0-9.1 jailbreaking tool
 .Sh SYNOPSIS
 .Nm
 .Op Fl cCdDEfhIlLnpRsSTvV
@@ -20,7 +20,7 @@
 .Op Fl -force-revert
 .Sh DESCRIPTION
 .Nm
-jailbreaks an iOS/iPadOS/tvOS 15.0-17.5, bridgeOS 6.0-8.3 device with an arm64 (arm64e excluded) on iOS 15.0-17.5,
+jailbreaks an arm64 (arm64e excluded) iOS/iPadOS/tvOS 15.0-18.0, bridgeOS 5.0-9.0 device,
 utilizing the
 .Em checkm8
 bootROM exploit.
@@ -57,7 +57,7 @@ In the remainder of this document, the term "iOS" and "iPadOS" will be used inte
 as the difference is negligible as far as the jailbreak is concerened.
 .Pp
 .Sh SUPPORTED DEVICES
-As described above, arm64 iOS 15.0-17.5 devices are supported, here is an explicit
+As described above, arm64 iOS 15.0-18.0 devices are supported, here is an explicit
 list of supported devicecs:
 
 .Bl -tag -compact
@@ -155,18 +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
-.Em rootdev=md0
-argument is used by
-.Nm
-and cannot be overriden. Additionally, the
+Specify custom XNU kernel command line. 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.
-This option is not supported on iOS/iPadOS 17.
+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
@@ -184,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
@@ -242,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
@@ -305,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
@@ -333,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
@@ -359,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.2"
 #endif
 
 #if defined(__APPLE__)

src/Makefile

@@ -68,7 +68,7 @@ BUILD_OPTIONS += TUI
 CFLAGS += -DTUI
 endif
 
-CHECKRA1N_VERSION ?= 0.1337.2
+CHECKRA1N_VERSION ?= 0.1337.3
 LIPO = lipo
 LDID = ldid
 

src/credits.c

@@ -13,7 +13,7 @@
 #define U stderr,
 #define B "#\n# palera1n: " BUILD_TAG " \n#\n"
 #define L "# ========  Made by  =======\n"
-#define E "# Made by: Nick Chan, " THE_PLUSH ", Samara, Mineek, staturnz, " BAKERAIN_DEVELOPE_R ", " NEKO_DEVELOPE_R " \n"
+#define E "# Made by: Nick Chan, " THE_PLUSH ", Khcrysalis, Mineek, staturnz, " BAKERAIN_DEVELOPE_R ", " NEKO_DEVELOPE_R " \n"
 #define M "# ======== Thanks to =======\n"
 #define A "# Thanks to: llsc12, Nebula, Lrdsnow, nikias (libimobiledevice),\n"
 #define K "# checkra1n team (Siguza, axi0mx, littlelailo et al.),\n"

src/dfuhelper.c

@@ -67,7 +67,7 @@ int connected_normal_mode(const usbmuxd_device_info_t *usbmuxd_device) {
 		LOG(LOG_ERROR, "Unable to get device information");
 		return 0;
 	}
-	if (strncmp(dev.CPUArchitecture, "arm64", strlen("arm64"))) {
+	if (strcmp(dev.CPUArchitecture, "arm64")) {
 		devinfo_free(&dev);
 		LOG(LOG_WARNING, "Ignoring non-arm64 device...");
 		LOG(LOG_WARNING, "palera1n doesn't and never will work on A12+ (arm64e)");

src/main.c

@@ -148,6 +148,8 @@ int palera1n(int argc, char *argv[], char *envp[]) {
 											  palerain_option_device_info)
 								 ) || device_has_booted)
 		goto normal_exit;
+	pthread_cancel(pongo_thread);
+	pthread_join(pongo_thread, NULL);
 	if (exec_checkra1n()) goto cleanup;
 
 	if ((palerain_flags & (palerain_option_pongo_exit | palerain_option_demote)))

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.1, bridgeOS 5.0-9.1 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) {
-				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)) {
+			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

src/pongo_helper.c

@@ -42,6 +42,9 @@ void *pongo_usb_callback(stuff_t *arg) {
 	}
 #endif
 	LOG(LOG_INFO, "Found PongoOS USB Device");
+	if (palerain_flags & palerain_option_pongo_exit)
+		goto done;
+
 	usb_device_handle_t handle = arg->handle;
 #ifdef TUI
 	if (tui_is_jailbreaking) {
@@ -114,10 +117,10 @@ void *pongo_usb_callback(stuff_t *arg) {
 #ifdef ROOTFUL
 	if ((palerain_flags & palerain_option_setup_partial_root)) {
 		LOG(LOG_INFO, "Please wait up to 5 minutes for the bindfs to be created.");
-		LOG(LOG_INFO, "Once the device boots up to iOS, run again without the -B (Create BindFS) option to jailbreak.");
+		LOG(LOG_INFO, "Once the device reboots into recovery mode, run again without the -B (Create BindFS) option to jailbreak.");
 	} else if ((palerain_flags & palerain_option_setup_rootful)) {
 		LOG(LOG_INFO, "Please wait up to 10 minutes for the fakefs to be created.");
-		LOG(LOG_INFO, "Once the device boots up to iOS, run again without the -c (Create FakeFS) option to jailbreak.");
+		LOG(LOG_INFO, "Once the device reboots into recovery mode, run again without the -c (Create FakeFS) option to jailbreak.");
 	}
 #endif
 	if (dfuhelper_thr_running) {

src/tui_screen_main.c

@@ -86,7 +86,7 @@ void tui_screen_main_redraw(void) {
     PRINTATT(3, 2, "Welcome to palera1n!");
 
     SETCOLOR(FG_WHITE, BG_BLACK);
-    PRINTATT(3, 9, "Made by: Nick Chan, Ploosh, Samara, Mineek");
+    PRINTATT(3, 9, "Made by: Nick Chan, Ploosh, Khcrysalis, Mineek");
     PRINTATT(3, 10, "staturnz, kok3shidoll, ");
     if ((tui_mouse_y == tui_y_offset + 9 && tui_mouse_x >= tui_x_offset + 25 && tui_mouse_x <= tui_x_offset + 25 + 8) || easter_egg) {
         SETCOLORA(FG_BRIGHT_WHITE, BG_BLACK, BOLD);

src/tui_screen_options.c

@@ -47,37 +47,34 @@ void tui_screen_options_nav(void) {
 extern bool easter_egg;
 
 void tui_screen_options_options(void) {
-    SETCOLOR(FG_WHITE, BG_BLACK);
-    // MOVETOT(3, 8);
-    // printf("[%c] %sAllow untested iOS/iPadOS versions" COLOR(FG_WHITE, BG_BLACK),
-    //     tui_options_allow_untested ? 'x' : ' ',
-    //     tui_options_nav_selection == 1 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
-    //         (
-    //             tui_mouse_x >= tui_x_offset + 6 && tui_mouse_x <= tui_x_offset + 6 + 34
-    //         ) && (tui_mouse_y == tui_y_offset + 7) ? COLOR(FG_BLACK, BG_WHITE) : ""
-    //     ));
+    SETCOLOR( FG_BRIGHT_BLACK, BG_BLACK);
     MOVETOT(3, 8);
+    printf("[%c] %sAllow untested iOS/iPadOS versions" COLOR(FG_WHITE, BG_BLACK),
+        tui_options_allow_untested ? ' ' : ' ',
+        COLOR(FG_BLACK, FG_BRIGHT_BLACK));
+    SETCOLOR(FG_WHITE, BG_BLACK);
+    MOVETOT(3, 9);
     printf("[%c] %sSafe Mode                         " COLOR(FG_WHITE, BG_BLACK),
         tui_options_safe_mode ? 'x' : ' ',
-        tui_options_nav_selection == 2 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
+        tui_options_nav_selection == 1 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
             (
-                tui_mouse_x >= tui_x_offset + 6 && tui_mouse_x <= tui_x_offset + 6 + 34
+                tui_mouse_x >= tui_x_offset + 5 && tui_mouse_x <= tui_x_offset + 5 + 34
             ) && (tui_mouse_y == tui_y_offset + 8) ? COLOR(FG_BLACK, BG_WHITE) : ""
         ));
-    MOVETOT(3, 9);
+    MOVETOT(3, 10);
     printf("[%c] %sVerbose Boot                      " COLOR(FG_WHITE, BG_BLACK),
         tui_options_verbose_boot ? 'x' : ' ',
-        tui_options_nav_selection == 3 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
+        tui_options_nav_selection == 2 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
             (
-                tui_mouse_x >= tui_x_offset + 6 && tui_mouse_x <= tui_x_offset + 6 + 34
+                tui_mouse_x >= tui_x_offset + 5 && tui_mouse_x <= tui_x_offset + 5 + 34
             ) && (tui_mouse_y == tui_y_offset + 9) ? COLOR(FG_BLACK, BG_WHITE) : ""
         ));
-    MOVETOT(3, 10);
+    MOVETOT(3, 11);
     printf("[%c] %sForce Revert                      " COLOR(FG_WHITE, BG_BLACK),
         tui_options_force_revert ? 'x' : ' ',
-        tui_options_nav_selection == 4 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
+        tui_options_nav_selection == 3 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
             (
-                tui_mouse_x >= tui_x_offset + 6 && tui_mouse_x <= tui_x_offset + 6 + 34
+                tui_mouse_x >= tui_x_offset + 5 && tui_mouse_x <= tui_x_offset + 5 + 34
             ) && (tui_mouse_y == tui_y_offset + 10) ? COLOR(FG_BLACK, BG_WHITE) : ""
         ));
     if (supports_bright_colors) {
@@ -85,13 +82,13 @@ void tui_screen_options_options(void) {
     } else {
         SETCOLOR(FG_BLUE, BG_BLACK);
     }
-    DRAWLINET(3, 12, 76);
+    DRAWLINET(3, 13, 76);
     SETCOLOR(FG_WHITE, BG_BLACK);
-    MOVETOT(7, 14);
+    MOVETOT(7, 15);
     printf("%sBoot Arguments:                   " COLOR(FG_WHITE, BG_BLACK),
-        tui_options_nav_selection == 5 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
+        tui_options_nav_selection == 4 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
             (
-                tui_mouse_x >= tui_x_offset + 6 && tui_mouse_x <= tui_x_offset + 6 + 34
+                tui_mouse_x >= tui_x_offset + 5 && tui_mouse_x <= tui_x_offset + 5 + 34
             ) && (
                 tui_mouse_y == tui_y_offset + 14 || tui_mouse_y == tui_y_offset + 15
             ) ? COLOR(FG_BLACK, BG_WHITE) : ""
@@ -99,16 +96,16 @@ void tui_screen_options_options(void) {
     const char* boot_args_hint = tui_options_is_editing_boot_args ? "(press ENTER when done)" : "  (press ENTER to edit)";
     MOVETOT((int)(80 - 5 - strlen(boot_args_hint)), 15);
     printf("%s", boot_args_hint);
-    MOVETOT(3, 16);
+    MOVETOT(3, 17);
     printf("[%c] %s%s                      " COLOR(FG_WHITE, BG_BLACK),
         tui_options_flower_chain ? 'x' : ' ',
-        tui_options_nav_selection == 6 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
+        tui_options_nav_selection == 5 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
             (
-                tui_mouse_x >= tui_x_offset + 6 && tui_mouse_x <= tui_x_offset + 6 + 34
+                tui_mouse_x >= tui_x_offset + 5 && tui_mouse_x <= tui_x_offset + 5 + 34
             ) && (tui_mouse_y == tui_y_offset + 16) ? COLOR(FG_BLACK, BG_WHITE) : ""
         ), easter_egg ? "Neko Chain  " : "Flower Chain");
 
-    MOVETOT(7, 15);
+    MOVETOT(7, 16);
     if (supports_bright_colors) {
         SETCOLOR(tui_options_is_editing_boot_args ? FG_YELLOW : FG_WHITE, BG_BRIGHT_BLACK);
     } else {
@@ -131,7 +128,7 @@ void tui_screen_options_options(void) {
     }
 
     if (tui_options_is_editing_boot_args) {
-        MOVETOT((int)(7 + tui_options_boot_args_cursor - tui_options_boot_args_offset), 15);
+        MOVETOT((int)(7 + tui_options_boot_args_cursor - tui_options_boot_args_offset), 16);
         if (supports_bright_colors) {
             SETCOLOR(FG_BRIGHT_BLACK, BG_YELLOW);
         } else {
@@ -141,9 +138,9 @@ void tui_screen_options_options(void) {
     }
 
     SETCOLOR(FG_WHITE, BG_BLACK);
-    MOVETOT(5, 15);
+    MOVETOT(5, 16);
     printf(tui_options_boot_args_offset > 0 ? "<<" : "  ");
-    MOVETOT(75, 15);
+    MOVETOT(75, 16);
     printf((strlen(tui_options_boot_args) - tui_options_boot_args_offset) > 68 ? ">>" : "  ");
 }
 
@@ -156,7 +153,7 @@ void tui_screen_options_redraw(void) {
     } else {
         SETCOLOR(FG_BLUE, BG_BLACK);
     }
-    DRAWLINET(3, 6, 75);
+    DRAWLINET(3, 6, 76);
     tui_screen_options_nav();
     tui_screen_options_options();
     fflush(stdout);
@@ -174,7 +171,7 @@ tui_screen_t tui_screen_options(void) {
             case TUI_INPUT_DOWN:
             case TUI_INPUT_TAB:
                 if (tui_options_is_editing_boot_args) break;
-                if (++tui_options_nav_selection > 6) tui_options_nav_selection = 0;
+                if (++tui_options_nav_selection > 5) tui_options_nav_selection = 0;
                 tui_screen_options_nav();
                 tui_screen_options_options();
                 fflush(stdout);
@@ -182,7 +179,7 @@ tui_screen_t tui_screen_options(void) {
             case TUI_INPUT_UP:
             case TUI_INPUT_TAB_BACK:
                 if (tui_options_is_editing_boot_args) break;
-                if (--tui_options_nav_selection < 0) tui_options_nav_selection = 6;
+                if (--tui_options_nav_selection < 0) tui_options_nav_selection = 5;
                 tui_screen_options_nav();
                 tui_screen_options_options();
                 fflush(stdout);
@@ -200,23 +197,23 @@ tui_screen_t tui_screen_options(void) {
                 switch(tui_options_nav_selection) {
                 case 0:
                     return MAIN_SCREEN;
+                // case 1:
+                //     tui_options_allow_untested = !tui_options_allow_untested;
+                //     break;
                 case 1:
-                    tui_options_allow_untested = !tui_options_allow_untested;
-                    break;
-                case 2:
                     tui_options_safe_mode = !tui_options_safe_mode;
                     break;
-                case 3:
+                case 2:
                     tui_options_verbose_boot = !tui_options_verbose_boot;
                     break;
-                case 4:
+                case 3:
                     tui_options_force_revert = !tui_options_force_revert;
                     break;
-                case 5:
+                case 4:
                     tui_options_is_editing_boot_args = !tui_options_is_editing_boot_args;
                     tui_options_boot_args_cursor = tui_options_is_editing_boot_args ? strlen(tui_options_boot_args) : 0;
                     break;
-                case 6:
+                case 5:
                     tui_options_flower_chain = !tui_options_flower_chain;
                     break;
                 }
@@ -240,8 +237,8 @@ tui_screen_t tui_screen_options(void) {
 
 #define MOUSEDOWN_HANDLER(y, val)                               \
                 if (tui_mouse_y == tui_y_offset + y &&          \
-                    tui_mouse_x >= tui_x_offset + 6 - 4 &&      \
-                    tui_mouse_x <= tui_x_offset + 6 + 34) {     \
+                    tui_mouse_x >= tui_x_offset + 5 - 4 &&      \
+                    tui_mouse_x <= tui_x_offset + 5 + 34) {     \
                     tui_options_nav_selection = val;            \
                     tui_options_nav_mouse_select = val;         \
                     tui_screen_options_nav();                   \
@@ -250,15 +247,14 @@ tui_screen_t tui_screen_options(void) {
                 }
 
                 if (!tui_options_is_editing_boot_args) {
-                    MOUSEDOWN_HANDLER(7, 1);
-                    MOUSEDOWN_HANDLER(8, 2);
-                    MOUSEDOWN_HANDLER(9, 3);
-                    MOUSEDOWN_HANDLER(10, 4);
-                    MOUSEDOWN_HANDLER(16, 6);
+                    MOUSEDOWN_HANDLER(8, 1);
+                    MOUSEDOWN_HANDLER(9, 2);
+                    MOUSEDOWN_HANDLER(10, 3);
+                    MOUSEDOWN_HANDLER(16, 5);
                 }
                 
-                MOUSEDOWN_HANDLER(14, 5);
-                MOUSEDOWN_HANDLER(15, 5);
+                MOUSEDOWN_HANDLER(14, 4);
+                MOUSEDOWN_HANDLER(15, 4);
 
 #undef MOUSEDOWN_HANDLER
                 break;
@@ -272,8 +268,8 @@ tui_screen_t tui_screen_options(void) {
 
 #define MOUSEUP_HANDLER(y, val, option, e)                          \
                 if (tui_mouse_y == tui_y_offset + y &&              \
-                    tui_mouse_x >= tui_x_offset + 6 - 4 &&          \
-                    tui_mouse_x <= tui_x_offset + 6 + 34 &&         \
+                    tui_mouse_x >= tui_x_offset + 5 - 4 &&          \
+                    tui_mouse_x <= tui_x_offset + 5 + 34 &&         \
                     tui_options_nav_mouse_select == val) {          \
                     tui_options_##option = !tui_options_##option;   \
                     e                                               \
@@ -283,18 +279,17 @@ tui_screen_t tui_screen_options(void) {
                 }
 
                 if (!tui_options_is_editing_boot_args) {
-                    MOUSEUP_HANDLER(7, 1, allow_untested, );
-                    MOUSEUP_HANDLER(8, 2, safe_mode, );
-                    MOUSEUP_HANDLER(9, 3, verbose_boot, );
-                    MOUSEUP_HANDLER(10, 4, force_revert, );
-                    MOUSEUP_HANDLER(16, 6, flower_chain, );
+                    MOUSEUP_HANDLER(8, 1, safe_mode, );
+                    MOUSEUP_HANDLER(9, 2, verbose_boot, );
+                    MOUSEUP_HANDLER(10, 3, force_revert, );
+                    MOUSEUP_HANDLER(16, 5, flower_chain, );
                 }
 
                 #define BOOTARGS_HANDLER                                                                                \
                 tui_options_boot_args_cursor = tui_options_is_editing_boot_args ? strlen(tui_options_boot_args) : 0;
 
-                MOUSEUP_HANDLER(14, 5, is_editing_boot_args, BOOTARGS_HANDLER);
-                MOUSEUP_HANDLER(15, 5, is_editing_boot_args, BOOTARGS_HANDLER);
+                MOUSEUP_HANDLER(14, 4, is_editing_boot_args, BOOTARGS_HANDLER);
+                MOUSEUP_HANDLER(15, 4, is_editing_boot_args, BOOTARGS_HANDLER);
 #undef MOUSEUP_HANDLER
                 tui_options_nav_mouse_select = -1;
                 break;