Compare commits

...
Author SHA1 Message Date
Nick Chan 2212050a44 we support 17.4 now not 16.5.1 2024-03-02 13:43:53 +08:00
Nick Chan afdba28439 we support 17.4 now 2024-03-02 13:42:18 +08:00
Nick Chan 7132c29246 Fixed clean fakefs 2024-03-02 13:35:14 +08:00
Samara d096218cec update control 2024-02-29 23:50:43 -08:00
Nick Chan 7dde88ea93 Update build.yml 2024-02-01 17:05:34 -08:00
meow 8044518088 update credits.c 2024-02-01 17:05:21 -08:00
Samara e79591c121 Update Makefile 2024-02-01 16:51:08 -08:00
Nick Chan 6f30ad8314 Compressed ramdisk support 2023-10-30 17:37:46 +08:00
Nick Chan f2ac3ae8d7 actions: update mbedtls to 3.5.0 2023-10-30 17:16:20 +08:00
Nick Chan 4ecd75bea7 Makefile: noname 2023-10-29 15:57:35 +08:00
samara 5dac69db66 chore: was my bad . 2023-10-25 20:07:24 -07:00
Nick Chan 91c5de6408 docs: s/17.0/17.1/ 2023-10-26 10:33:14 +08:00
samara d65877f851 chore: why use mirror 2023-10-23 20:59:31 -07:00
Nick Chan 3df6791ebd actions: build a static linux usbmuxd 2023-10-14 18:23:02 +08:00
samara 06a93e697b chore: minor spelling mistake 2023-10-02 16:41:51 -07:00
Nick Chan ffad44ce10 docs/palera1n.1: minor formatting and version fixes 2023-10-02 23:02:55 +08:00
alexia 4775c8ab23 chore: update palera1n-ios description (#399)
Added a note saying it is not an untether, and about bad success rate.
2023-08-08 04:28:43 -07:00
kok3shidoll 7992b1e2a9 Makefile: Change Pongo.bin and kpf paths 2023-07-28 03:18:02 +09:00
samara 3fdb75b9fa chore: change readme 2023-07-27 05:57:29 -07:00
14 changed files with 95 additions and 49 deletions

No files matched your search

+41 -8
View File
@@ -74,7 +74,7 @@ jobs:
minos: 7.0 minos: 7.0
runs-on: macos-12 runs-on: macos-12
env: env:
MBEDTLS_VERSION: 3.4.0 MBEDTLS_VERSION: 3.5.2
READLINE_VERSION: 8.2 READLINE_VERSION: 8.2
SLANG_VERSION: 2.3.3 SLANG_VERSION: 2.3.3
NEWT_VERSION: 0.52.23 NEWT_VERSION: 0.52.23
@@ -344,7 +344,7 @@ jobs:
forceUpload: true forceUpload: true
dryRun: false dryRun: false
localDir: 'ready/' localDir: 'ready/'
remoteDir: "/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch || github.ref }}/${{ github.run_number }}" remoteDir: "/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch || github.ref_name }}/${{ github.run_number }}"
- name: Upload ${{ matrix.os }} thin ${{ matrix.arch }} build - name: Upload ${{ matrix.os }} thin ${{ matrix.arch }} build
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' }}
@@ -377,7 +377,7 @@ jobs:
with: with:
packages: sed coreutils packages: sed coreutils
cache: true cache: true
mirror: 'https://procursus.itsnebula.net/' mirror: 'https://apt.procurs.us/'
- name: Download all Darwin artifacts - name: Download all Darwin artifacts
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
@@ -494,7 +494,7 @@ jobs:
forceUpload: true forceUpload: true
dryRun: false dryRun: false
localDir: 'ready/' localDir: 'ready/'
remoteDir: "/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch || github.ref }}/${{ github.run_number }}" remoteDir: "/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch || github.ref_name }}/${{ github.run_number }}"
build-Linux: build-Linux:
strategy: strategy:
@@ -506,7 +506,7 @@ jobs:
- aarch64-linux-musl - aarch64-linux-musl
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
MBEDTLS_VERSION: 3.4.0 MBEDTLS_VERSION: 3.5.2
LIBUSB_VERSION: 1.0.26 LIBUSB_VERSION: 1.0.26
READLINE_VERSION: 8.2 READLINE_VERSION: 8.2
SLANG_VERSION: 2.3.3 SLANG_VERSION: 2.3.3
@@ -601,12 +601,14 @@ jobs:
git clone --depth=1 https://github.com/libimobiledevice/libirecovery 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/libusbmuxd
git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice
git clone --depth=1 https://github.com/libimobiledevice/usbmuxd
- name: Build Mbed TLS - name: Build Mbed TLS
run: | run: |
cd mbedtls-${{ env.MBEDTLS_VERSION }} cd mbedtls-${{ env.MBEDTLS_VERSION }}
cat ../patches/mbedtls/0001-Allow-empty-x509-cert-issuer.patch | patch -sN -d . -p1 cat ../patches/mbedtls/0001-Allow-empty-x509-cert-issuer.patch | patch -sN -d . -p1
mkdir build mkdir build
if [ "${{ matrix.triple }}" = "i486-linux-musl" ]; then sed -i '/define MBEDTLS_AESNI_C/d' include/mbedtls/mbedtls_config.h; fi
cd build cd build
cmake .. \ cmake .. \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
@@ -750,9 +752,25 @@ jobs:
sudo rm /usr/local sudo rm /usr/local
sudo mv /usr/local.bak /usr/local sudo mv /usr/local.bak /usr/local
- name: Build usbmuxd
run: |
cd usbmuxd
autoreconf -fiv
./configure ${{ env.CONFIGURE_ARGS }} --without-systemd
${{ matrix.triple }}-gcc ${{ env.CFLAGS }} -I${{ env.DESTDIR }}/${{ env.PREFIX }}/include/libusb-1.0 src/*.c \
-DHAVE_CONFIG_H -no-pie \
-I. -static ${{ env.LDFLAGS }}} -limobiledevice-1.0 -lusbmuxd-2.0 -limobiledevice-glue-1.0 \
-lplist-2.0 -lusb-1.0 -lmbedtls -lmbedcrypto -lmbedx509 -lpthread -o usbmuxd
mkdir -p ${{ env.DESTDIR }}/${{ env.PREFIX }}/sbin
${{ matrix.triple }}-objcopy --only-keep-debug usbmuxd usbmuxd.debug
${{ matrix.triple }}-strip --strip-debug --strip-unneeded usbmuxd
${{ matrix.triple }}-objcopy --add-gnu-debuglink=usbmuxd.debug usbmuxd
install -m755 usbmuxd usbmuxd.debug ${{ env.DESTDIR }}/${{ env.PREFIX }}/sbin
cd ..
- name: Build palera1n - name: Build palera1n
run: | run: |
cp -a sysroot/${{ env.PREFIX }}/{include,lib} dep_root cp -a ${{ env.DESTDIR }}/${{ env.PREFIX }}/{include,lib} dep_root
find dep_root -name '*.so' -delete find dep_root -name '*.so' -delete
find dep_root -name '*.la' -delete find dep_root -name '*.la' -delete
CC="${{ matrix.triple }}-gcc" make -j$(nproc) CC="${{ matrix.triple }}-gcc" make -j$(nproc)
@@ -766,10 +784,12 @@ jobs:
- name: Prepare artifact - name: Prepare artifact
run: | run: |
mkdir ready mkdir ready usbmuxd-static
mv palera1n.debug ready/palera1n-${{ env.CHECKRA1N_NAME }}.debug mv palera1n.debug ready/palera1n-${{ env.CHECKRA1N_NAME }}.debug
mv src/palera1n ready/palera1n-${{ env.CHECKRA1N_NAME }} mv src/palera1n ready/palera1n-${{ env.CHECKRA1N_NAME }}
tar -zcf ready/dep_root_${{ matrix.triple }}.tgz dep_root tar -zcf ready/dep_root_${{ matrix.triple }}.tgz dep_root
install -m755 sysroot/${{ env.PREFIX }}/sbin/usbmuxd usbmuxd-static/usbmuxd-${{ env.CHECKRA1N_NAME }}
install -m755 sysroot/${{ env.PREFIX }}/sbin/usbmuxd.debug usbmuxd-static/usbmuxd-${{ env.CHECKRA1N_NAME }}.debug
- name: Build debs - name: Build debs
run: | run: |
@@ -807,7 +827,20 @@ jobs:
forceUpload: true forceUpload: true
dryRun: false dryRun: false
localDir: 'ready/' localDir: 'ready/'
remoteDir: "/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch || github.ref }}/${{ github.run_number }}" remoteDir: "/palera1n/artifacts/c-rewrite/${{ steps.branch-name.outputs.ref_branch || github.ref_name }}/${{ github.run_number }}"
- name: Upload usbmuxd artifact
if: ${{ github.event_name != 'pull_request' }}
uses: wangyucode/[email protected]
with:
host: ${{ secrets.NICKCHAN_FTP_HOST }}
port: ${{ secrets.NICKCHAN_FTP_PORT }}
username: palera1n
password: ${{ secrets.NICKCHAN_FTP_PASS }}
forceUpload: true
dryRun: false
localDir: 'usbmuxd-static/'
remoteDir: "/palera1n/artifacts/usbmuxd-static"
finish-build: finish-build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
+1
View File
@@ -11,6 +11,7 @@ src/palera1n
!xxd-embedded.h !xxd-embedded.h
src/binpack.dmg src/binpack.dmg
src/ramdisk.dmg src/ramdisk.dmg
src/ramdisk.dmg.lzma
src/xxd-*.c src/xxd-*.c
.DS_Store .DS_Store
!palera1n.1 !palera1n.1
+1 -3
View File
@@ -1,5 +1,3 @@
NAME = Dusk
SRC = $(shell pwd) SRC = $(shell pwd)
DEP = $(SRC)/dep_root DEP = $(SRC)/dep_root
STRIP = strip STRIP = strip
@@ -64,7 +62,7 @@ CFLAGS += -DBUILD_WHOAMI="\"$(BUILD_WHOAMI)\"" -DBUILD_TAG="\"$(BUILD_TAG)\""
CFLAGS += -DBUILD_NUMBER="\"$(BUILD_NUMBER)\"" -DBUILD_BRANCH="\"$(BUILD_BRANCH)\"" CFLAGS += -DBUILD_NUMBER="\"$(BUILD_NUMBER)\"" -DBUILD_BRANCH="\"$(BUILD_BRANCH)\""
CFLAGS += -DBUILD_COMMIT="\"$(BUILD_COMMIT)\"" CFLAGS += -DBUILD_COMMIT="\"$(BUILD_COMMIT)\""
export SRC DEP CC CFLAGS LDFLAGS LIBS TARGET_OS DEV_BUILD BUILD_DATE BUILD_TAG BUILD_WHOAMI BUILD_STYLE BUILD_NUMBER BUILD_BRANCH export SRC DEP CC CFLAGS LDFLAGS LIBS SHELL TARGET_OS DEV_BUILD BUILD_DATE BUILD_TAG BUILD_WHOAMI BUILD_STYLE BUILD_NUMBER BUILD_BRANCH
all: palera1n all: palera1n
+1 -1
View File
@@ -51,4 +51,4 @@ Make sure you provide full details on your device, such as:
Using `-VvL` would help with debugging. Using `-VvL` would help with debugging.
Join the [Support Discord](https://dsc.gg/palera1n), and create a thread in [#support](https://discord.com/channels/1028398973452570725/1028730487700738130) or ask in [#general](https://discord.com/channels/1028398973452570725/1028398976640229380). Join the [Support Discord](https://dsc.gg/palera1n)
+4 -10
View File
@@ -2,11 +2,11 @@
.\" Copyright (c) 2023 Nick Chan .\" Copyright (c) 2023 Nick Chan
.\" SPDX-License-Identifier: MIT .\" SPDX-License-Identifier: MIT
.\" .\"
.Dd "2 July 2023" .Dd "26 October 2023"
.Dt palera1n 1 .Dt palera1n 1
.Sh NAME .Sh NAME
.Nm palera1n .Nm palera1n
.Nd iOS 15.0-16.5.1 arm64 iOS/iPadOS jailbreaking tool .Nd iOS 15.0-17.4 arm64 iOS/iPadOS jailbreaking tool
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm .Nm
.Op Fl dDEhILnpRsSvV .Op Fl dDEhILnpRsSvV
@@ -124,13 +124,6 @@ iOS15 branch or your own fork of it.
Makes jbinit log to Makes jbinit log to
.Em /cores/jbinit.log .Em /cores/jbinit.log
This file may be viewed from sandboxed applications while jailbroken. This file may be viewed from sandboxed applications while jailbroken.
.It Fl l , -rootless
Proceed in rootless mode, this is the default when neither
.Fl l , -rootless
and
.Fl f , -fakefs
is specified.
>>>>>>> a8e6075 (paleinfo v2)
.It Fl n , -exit-recovery .It Fl n , -exit-recovery
Exit recovery mode and exit. Exit recovery mode and exit.
.It Fl o , -override-overlay Ar overlay file .It Fl o , -override-overlay Ar overlay file
@@ -274,4 +267,5 @@ December 13, 2022. Later, the first attempt to rewrite palera1n into C begins on
01 2023. The 01 2023. The
.Nm .Nm
utility described here is the second attempt, which first started on January 16, 2023, utility described here is the second attempt, which first started on January 16, 2023,
using checkra1n 1337 and the plush KPF. using checkra1n 1337 and a custom KPF.
Something happened on August 15, 2023.
+2 -2
View File
@@ -11,8 +11,8 @@ extern unsigned int checkra1n_len;
extern unsigned char checkra1n_kpf_pongo[]; extern unsigned char checkra1n_kpf_pongo[];
extern unsigned int checkra1n_kpf_pongo_len; extern unsigned int checkra1n_kpf_pongo_len;
extern unsigned char ramdisk_dmg[]; extern unsigned char ramdisk_dmg_lzma[];
extern unsigned int ramdisk_dmg_len; extern unsigned int ramdisk_dmg_lzma_len;
extern unsigned char binpack_dmg[]; extern unsigned char binpack_dmg[];
extern unsigned int binpack_dmg_len; extern unsigned int binpack_dmg_len;
+7 -2
View File
@@ -8,10 +8,15 @@ Depends: usbmuxd
Section: Utilities Section: Utilities
Priority: optional Priority: optional
Homepage: https://palera.in Homepage: https://palera.in
Description: iOS 15.0-16.5.1 semi-tethered checkm8 jailbreak Description: iOS 15.0+ semi-tethered checkm8 jailbreak
palera1n is an iOS/iPadOS 15.0-16.5.1 semi tethered jailbreak palera1n is an iOS/iPadOS 15.0+ semi tethered jailbreak
based on the checkm8 exploit. based on the checkm8 exploit.
. .
palera1n is able to jailbreak the device in fakefs-rootful mode, palera1n is able to jailbreak the device in fakefs-rootful mode,
where / is writable, as well as rootless mode, where / cannot be where / is writable, as well as rootless mode, where / cannot be
written to. written to.
.
IMPORTANT: This does NOT make palera1n untethered or allow you to
jailbreak your current device without a computer. It just allows
you to jailbreak another iDevice using this device, given you have
an appropriate cable. Also, the success rate is likely to be bad.
+2 -2
View File
@@ -7,8 +7,8 @@ Author: palera1n team
Section: Utilities Section: Utilities
Priority: optional Priority: optional
Homepage: https://palera.in Homepage: https://palera.in
Description: iOS 15.0-16.5 semi-tethered checkm8 jailbreak Description: iOS 15.0+ semi-tethered checkm8 jailbreak
palera1n is an iOS/iPadOS 15.0-16.5 semi tethered jailbreak palera1n is an iOS/iPadOS 15.0+ semi tethered jailbreak
based on the checkm8 exploit. based on the checkm8 exploit.
. .
palera1n is able to jailbreak the device in fakefs-rootful mode, palera1n is able to jailbreak the device in fakefs-rootful mode,
+18 -7
View File
@@ -18,9 +18,9 @@ BUILD_OPTIONS += FORCE_HELPER
endif endif
ifneq ($(NO_RAMDISK),1) ifneq ($(NO_RAMDISK),1)
OBJECTS += xxd-ramdisk.dmg.o OBJECTS += xxd-ramdisk.dmg.lzma.o
else else
CFLAGS += -DNO_RAMDISK CFLAGS += -DNO_RAMDISK -DRAMDISK_COMPRESSED_SIZE=\"0\"
BUILD_OPTIONS += NO_RAMDISK BUILD_OPTIONS += NO_RAMDISK
endif endif
ifneq ($(NO_KPF),1) ifneq ($(NO_KPF),1)
@@ -122,6 +122,14 @@ endif
xxd-%.c: % xxd-%.c: %
xxd -iC $< > $@ xxd -iC $< > $@
ifneq ($(NO_RAMDISK),1)
pongo_helper.o: pongo_helper.c $(wildcard ../include/*.h) ramdisk.dmg
$(CC) -c $(CFLAGS) -DRAMDISK_UNCOMPRESSED_SIZE="\"$$(wc -c < ramdisk.dmg | tr -d ' ')\"" $<
else
pongo_helper.o: pongo_helper.c $(wildcard ../include/*.h)
$(CC) -c $(CFLAGS) $<
endif
%.o: %.c $(wildcard ../include/*.h) %.o: %.c $(wildcard ../include/*.h)
$(CC) -c $(CFLAGS) $< $(CC) -c $(CFLAGS) $<
@@ -137,18 +145,21 @@ libcheckra1nhelper.dylib: chkstk.S
$(CC) $(CFLAGS) $(LDFLAGS) -shared chkstk.S -o libcheckra1nhelper.dylib $(CC) $(CFLAGS) $(LDFLAGS) -shared chkstk.S -o libcheckra1nhelper.dylib
checkra1n-kpf-pongo: checkra1n-kpf-pongo:
curl -LO https://cdn.nickchan.lol/palera1n/artifacts/kpf/checkra1n-kpf-pongo curl -LO https://cdn.nickchan.lol/palera1n/artifacts/kpf/b8-fixes/checkra1n-kpf-pongo
ramdisk.dmg.lzma: ramdisk.dmg
xz --format=lzma -vf6ekT 0 ramdisk.dmg
ramdisk.dmg: ramdisk.dmg:
curl -LO https://cdn.nickchan.lol/palera1n/c-rewrite/deps/ramdisk.dmg curl -LO https://cdn.nickchan.lol/palera1n/c-rewrite/deps/b8/ramdisk.dmg
binpack.dmg: binpack.dmg:
curl -LO https://cdn.nickchan.lol/palera1n/c-rewrite/deps/binpack.dmg curl -LO https://cdn.nickchan.lol/palera1n/c-rewrite/deps/b8/binpack.dmg
Pongo.bin: Pongo.bin:
curl -LO https://cdn.nickchan.lol/palera1n/artifacts/kpf/Pongo.bin curl -LO https://cdn.nickchan.lol/palera1n/artifacts/kpf/b8-fixes/Pongo.bin
clean: clean:
rm -rf *.o palera1n checkra1n checkra1n.c palera1n.dSYM libcheckra1nhelper.dylib rm -rf *.o palera1n checkra1n checkra1n.c palera1n.dSYM ramdisk.dmg.lzma libcheckra1nhelper.dylib
.PHONY: all clean .PHONY: all clean
+2 -2
View File
@@ -12,8 +12,8 @@
#define B stderr #define B stderr
#define L , #define L ,
#define E "# == palera1n-c == \n#\n" #define E "# == palera1n-c == \n#\n"
#define M "# Made by: Nick Chan, " THE_PLUSH ", Samara, Nebula, staturnz, " BAKERAIN_DEVELOPE_R " \n#\n" #define M "# Made by: Nick Chan, " THE_PLUSH ", Samara, Mineek, staturnz, " BAKERAIN_DEVELOPE_R " \n#\n"
#define A "# Thanks to: pythonplayer123, llsc12, Mineek, tihmstar, nikias\n" #define A "# Thanks to: pythonplayer123, llsc12, Nebula, tihmstar, nikias\n"
#define K "# (libimobiledevice), checkra1n team (Siguza, axi0mx, littlelailo\n" #define K "# (libimobiledevice), checkra1n team (Siguza, axi0mx, littlelailo\n"
#define I "# et al.), Procursus Team (Hayden Seay, Cameron Katri, Keto et.al)\n\n" #define I "# et al.), Procursus Team (Hayden Seay, Cameron Katri, Keto et.al)\n\n"
#define N ) #define N )
+2 -2
View File
@@ -6,8 +6,8 @@ unsigned int checkra1n_kpf_pongo_len = 0;
#endif #endif
#ifdef NO_RAMDISK #ifdef NO_RAMDISK
unsigned char* ramdisk_dmg = NULL; unsigned char* ramdisk_dmg_lzma = NULL;
unsigned int ramdisk_dmg_len = 0; unsigned int ramdisk_dmg_lzma_len = 0;
#endif #endif
#ifdef NO_CHECKRAIN #ifdef NO_CHECKRAIN
+1 -1
View File
@@ -37,7 +37,7 @@ char xargs_cmd[0x270] = "xargs ", palerain_flags_cmd[0x30] = "deadbeef";
extern char** environ; extern char** environ;
niarelap_file_t* kpf_to_upload_1 = &checkra1n_kpf_pongo; niarelap_file_t* kpf_to_upload_1 = &checkra1n_kpf_pongo;
niarelap_file_t* ramdisk_to_upload_1 = &ramdisk_dmg; niarelap_file_t* ramdisk_to_upload_1 = &ramdisk_dmg_lzma;
niarelap_file_t* overlay_to_upload_1 = &binpack_dmg; niarelap_file_t* overlay_to_upload_1 = &binpack_dmg;
niarelap_file_t** kpf_to_upload = &kpf_to_upload_1; niarelap_file_t** kpf_to_upload = &kpf_to_upload_1;
+4 -4
View File
@@ -21,7 +21,7 @@ static bool force_use_verbose_boot = false;
static struct option longopts[] = { static struct option longopts[] = {
{"setup-partial-fakefs", no_argument, NULL, 'B'}, {"setup-partial-fakefs", no_argument, NULL, 'B'},
{"setup-fakefs", no_argument, NULL, 'c'}, {"setup-fakefs", no_argument, NULL, 'c'},
{"clean-fakefs", no_argument, NULL, 'c'}, {"clean-fakefs", no_argument, NULL, 'C'},
{"dfuhelper", no_argument, NULL, 'D'}, {"dfuhelper", no_argument, NULL, 'D'},
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{"pongo-shell", no_argument, NULL, 'p'}, {"pongo-shell", no_argument, NULL, 'p'},
@@ -71,7 +71,7 @@ static int usage(int e, char* prog_name)
#endif #endif
"] [-e boot arguments] [-k Pongo image] [-o overlay file] [-r ramdisk file] [-K KPF file] [-i checkra1n file]\n" "] [-e boot arguments] [-k Pongo image] [-o overlay file] [-r ramdisk file] [-K KPF file] [-i checkra1n file]\n"
"Copyright (C) 2023, palera1n team, All Rights Reserved.\n\n" "Copyright (C) 2023, palera1n team, All Rights Reserved.\n\n"
"iOS/iPadOS 15.0-16.5.1 arm64 jailbreaking tool\n\n" "iOS/iPadOS 15.0-17.4 arm64 jailbreaking tool\n\n"
"\t--version\t\t\t\tPrint version\n" "\t--version\t\t\t\tPrint version\n"
"\t--force-revert\t\t\t\tRemove jailbreak\n" "\t--force-revert\t\t\t\tRemove jailbreak\n"
#ifdef DEV_BUILD #ifdef DEV_BUILD
@@ -207,7 +207,7 @@ int optparse(int argc, char* argv[]) {
return 1; return 1;
break; break;
case 'r': case 'r':
if (override_file(&override_ramdisk, ramdisk_to_upload, &ramdisk_dmg_len, optarg)) if (override_file(&override_ramdisk, ramdisk_to_upload, &ramdisk_dmg_lzma_len, optarg))
return 1; return 1;
break; break;
case 'K': case 'K':
@@ -331,7 +331,7 @@ int optparse(int argc, char* argv[]) {
LOG(LOG_VERBOSE4, "kpf override ptr %p -> %p", override_kpf.orig_ptr, **kpf_to_upload); LOG(LOG_VERBOSE4, "kpf override ptr %p -> %p", override_kpf.orig_ptr, **kpf_to_upload);
} }
if (override_ramdisk.magic == OVERRIDE_MAGIC) { if (override_ramdisk.magic == OVERRIDE_MAGIC) {
LOG(LOG_VERBOSE4, "ramdisk override length %u -> %u", override_ramdisk.orig_len, ramdisk_dmg_len); LOG(LOG_VERBOSE4, "ramdisk override length %u -> %u", override_ramdisk.orig_len, ramdisk_dmg_lzma_len);
LOG(LOG_VERBOSE4, "ramdisk override ptr %p -> %p", override_ramdisk.orig_ptr, **ramdisk_to_upload); LOG(LOG_VERBOSE4, "ramdisk override ptr %p -> %p", override_ramdisk.orig_ptr, **ramdisk_to_upload);
} }
if (override_overlay.magic == OVERRIDE_MAGIC) { if (override_overlay.magic == OVERRIDE_MAGIC) {
+9 -5
View File
@@ -49,12 +49,16 @@ void *pongo_usb_callback(stuff_t *arg) {
issue_pongo_command(handle, "rootfs"); issue_pongo_command(handle, "rootfs");
} }
#ifdef NO_RAMDISK #ifdef NO_RAMDISK
if (ramdisk_dmg_len != 0) if (ramdisk_dmg_lzma_len != 0)
#endif #endif
{ {
strncat(xargs_cmd, " rootdev=md0", 0x270 - strlen(xargs_cmd) - 1); strncat(xargs_cmd, " rootdev=md0", 0x270 - strlen(xargs_cmd) - 1);
upload_pongo_file(handle, **ramdisk_to_upload, ramdisk_dmg_len); upload_pongo_file(handle, **ramdisk_to_upload, ramdisk_dmg_lzma_len);
issue_pongo_command(handle, "ramdisk"); if (&(**ramdisk_to_upload) == &ramdisk_dmg_lzma)
issue_pongo_command(handle, "ramdisk " RAMDISK_UNCOMPRESSED_SIZE);
else {
issue_pongo_command(handle, "ramdisk");
}
} }
#ifdef NO_OVERLAY #ifdef NO_OVERLAY
if (binpack_dmg_len != 0) if (binpack_dmg_len != 0)
@@ -69,10 +73,10 @@ void *pongo_usb_callback(stuff_t *arg) {
LOG(LOG_INFO, "Booting Kernel..."); LOG(LOG_INFO, "Booting Kernel...");
if ((palerain_flags & palerain_option_setup_partial_root)) { 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, "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)) { } 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, "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.");
} }
if (dfuhelper_thr_running) { if (dfuhelper_thr_running) {
pthread_cancel(dfuhelper_thread); pthread_cancel(dfuhelper_thread);