From bccf97396b1cb50742c13cab915caa7d3df64090 Mon Sep 17 00:00:00 2001
From: LukeZGD <26163116+LukeZGD@users.noreply.github.com>
Date: Tue, 28 Nov 2023 12:36:12 +0800
Subject: [PATCH] Add fstab8 tar for 8.4.1 ipsws

- apparently at some point this isnt being done for 8.4.1 ipsws so here its fixed now
- fstab8 is basically just stock fstab with nosuid removed
---
 README.md  | 20 ++++++++++----------
 restore.sh | 20 ++++++++++++--------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index d9906a3..f4ba610 100644
--- a/README.md
+++ b/README.md
@@ -76,19 +76,19 @@
     - iPhone 5S, 6, 6 Plus
     - iPad Air 1, mini 2, mini 3
     - iPod touch 6
-- Restoring with powdersn0w is supported on the following devices:
-    - iPhone 4 GSM - targets iOS 4.0 to 7.1.1
-    - iPhone 4 CDMA - targets iOS 5.0 to 7.1.1 (4.2.x is not functional)
-    - iPhone 4S, 5, 5C, iPad 2 Rev A, iPad 4, iPod touch 5 - targets iOS 5.0 to 9.3.5
-    - iPad 1 - targets iOS 4.3 to 5.1 (4.2.1 and 3.2.x are not functional)
-    - iPod touch 3 - targets iOS 4.0 to 5.1 (3.1.x is not functional)
+- Restoring with powdersn0w is supported on the following devices and target version range:
+    - iPhone 4 GSM - iOS 4.0 to 7.1.1 (4.2.1 is not functional)
+    - iPhone 4 CDMA - iOS 5.0 to 7.1.1 (4.2.x is not functional)
+    - iPhone 4S, 5, 5C, iPad 2 Rev A, iPad 4, iPod touch 5 - iOS 5.0 to 9.3.5
+    - iPad 1 - iOS 4.3 to 5.1 (4.2.1 and 3.2.x are not functional)
+    - iPod touch 3 - iOS 4.0 to 5.1 (3.1.x is not functional)
     - Using powdersn0w requires iOS 7.1.x blobs for your device
+        - No blob requirement for iPhone 4, iPad 1, iPod touch 3 (7.1.2 and 5.1.1 are signed)
         - For iPhone 5 and 5C, both 7.0.x and 7.1.x blobs can be used
         - For iPad 4, only 7.0.x blobs can be used
-        - For iPad 1 and iPod touch 3, 5.1.1 blobs are used instead
-- Restoring to other unsigned versions without blobs is supported on the following devices:
-    - iPhone 3GS - targets iOS 3.1.3 to 5.1.1
-    - iPod touch 2 - targets iOS 3.1.3 to 4.1
+- Restoring to other unsigned versions without blobs is supported on the following devices and target versions:
+    - iPhone 3GS - iOS 3.1.3, 4.1, 4.3.3, 5.0.1, 5.1.1
+    - iPod touch 2 - iOS 3.1.3, 4.1
 
 ## Supported OS versions/distros
 
diff --git a/restore.sh b/restore.sh
index 5dee795..6ee9392 100755
--- a/restore.sh
+++ b/restore.sh
@@ -1892,6 +1892,7 @@ ipsw_prepare_jailbreak() {
     if [[ $ipsw_jailbreak == 1 ]]; then
         if [[ $device_target_vers == "8.4.1" ]]; then
             ipsw_prepare_rebootsh
+            JBFiles+=("$jelbrek/fstab8.tar")
             JBFiles2=("daibutsu/bin.tar" "daibutsu/untether.tar" "freeze.tar")
             for i in {0..2}; do
                 cp $jelbrek/${JBFiles2[$i]} .
@@ -1997,9 +1998,6 @@ ipsw_prepare_keys() {
         ;;
 
         "KernelCache" )
-            if [[ $vers == "3"* || $vers == "4"* || $vers == "5"* || $vers == "7"* ]]; then
-                return
-            fi
             echo -e "<key>$comp</key><dict><key>File</key><string>$name</string><key>IV</key><string>$iv</string><key>Key</key><string>$key</string><key>DecryptPath</key><string>Downgrade/$comp</string><key>Patch</key><true/>" >> $NewPlist
         ;;
     esac
@@ -2111,8 +2109,11 @@ ipsw_prepare_bundle() {
         build="$device_base_build"
         FirmwareBundle+="BASE_"
     elif [[ $1 == "target" ]]; then
-        if [[ $ipsw_jailbreak == 1 && $vers != "3"* && $vers != "4"* && $vers != "5"* && $vers != "7"* ]]; then
-            ipsw_prepare_config true true
+        if [[ $ipsw_jailbreak == 1 ]]; then
+            case $vers in
+                [457]* ) ipsw_prepare_config false true;;
+                * ) ipsw_prepare_config true true;;
+            esac
         else
             ipsw_prepare_config false true
         fi
@@ -2246,10 +2247,13 @@ ipsw_prepare_bundle() {
         ipsw_prepare_keys RestoreRamdisk $1
         ipsw_prepare_keys RestoreDeviceTree $1
         ipsw_prepare_keys RestoreLogo $1
-        if [[ $1 != "target" || $vers == "3"* || $vers == "4"* || $vers == "5"* || $vers == "7"* ]]; then
-            ipsw_prepare_keys RestoreKernelCache $1
+        if [[ $1 == "target" ]]; then
+            case $vers in
+                [457]* ) ipsw_prepare_keys RestoreKernelCache $1;;
+                * ) ipsw_prepare_keys KernelCache $1;;
+            esac
         else
-            ipsw_prepare_keys KernelCache $1
+            ipsw_prepare_keys RestoreKernelCache $1
         fi
         echo -e "</dict>" >> $NewPlist
     fi