From cad049dd41a87c39c190ab47312a5128a63088a1 Mon Sep 17 00:00:00 2001
From: alexia <me@alexia.lol>
Date: Tue, 7 Feb 2023 03:13:44 +0100
Subject: [PATCH] ensure fs is always set (#331)

---
 palera1n.sh | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/palera1n.sh b/palera1n.sh
index 8c29f37..89e300c 100755
--- a/palera1n.sh
+++ b/palera1n.sh
@@ -597,7 +597,7 @@ _wait_for_device
 
 # Dump blobs, and install pogo if needed 
 if [ -f blobs/"$deviceid"-"$version".der ]; then
-    if [ -f .rd_in_progress ]; then
+    if [ -f .rd_in_progress ] || ! [ -f .fs-"$deviceid" ]; then
         rm blobs/"$deviceid"-"$version".der
     fi
 fi
@@ -638,7 +638,7 @@ if [ ! -f blobs/"$deviceid"-"$version".der ]; then
 
     touch .rd_in_progress
     
-    if [ "$tweaks" = "1" ]; then
+    if [ "$tweaks" = "1" ] && [ "$semi_tethered" = "1" ]; then
         echo "[*] Testing for baseband presence"
         if [ "$(remote_cmd "/usr/bin/mgask HasBaseband | grep -E 'true|false'")" = "true" ] && [[ "${cpid}" == *"0x700"* ]]; then
             disk=7
@@ -649,18 +649,16 @@ if [ ! -f blobs/"$deviceid"-"$version".der ]; then
                 disk=7
             fi
         fi
+    else
+        disk=1
+    fi
 
-        if [ -z "$semi_tethered" ]; then
-            disk=1
-        fi
+    echo "$disk" > .fs-"$deviceid"
 
-        if [[ "$version" == *"16"* ]]; then
-            fs=disk1s$disk
-        else
-            fs=disk0s1s$disk
-        fi
-
-        echo "$disk" > .fs-"$deviceid"
+    if [[ "$version" == *"16"* ]]; then
+        fs=disk1s$disk
+    else
+        fs=disk0s1s$disk
     fi
 
     # mount filesystems, no user data partition