Skip to content

Run a virtual iPhone on an Apple Silicon Mac.

Swift

Harden dropbear key setup checks

xiahouzhen29d0f803d86b
diff --git a/scripts/cfw_install_dev.sh b/scripts/cfw_install_dev.sh
index 877fa755..9aa88c65 100755
--- a/scripts/cfw_install_dev.sh
+++ b/scripts/cfw_install_dev.sh
@@ -141,7 +141,14 @@ assert_mount_under_vm() {
# Mount device filesystem, tolerate already-mounted
remote_mount() {
local dev="$1" mnt="$2" opts="${3:-rw}"
+ ssh_cmd "/bin/mkdir -p $mnt"
+ if ssh_cmd "/sbin/mount | /usr/bin/grep -q ' on $mnt '"; then
+ return 0
+ fi
ssh_cmd "/sbin/mount_apfs -o $opts $dev $mnt 2>/dev/null || true"
+ if ! ssh_cmd "/sbin/mount | /usr/bin/grep -q ' on $mnt '"; then
+ die "Failed to mount $dev at $mnt (opts=$opts). Make sure the ramdisk was booted with the expected patched kernel."
+ fi
}
# ── Find restore directory ─────────────────────────────────────
diff --git a/scripts/vphone_jb_setup.sh b/scripts/vphone_jb_setup.sh
index 5fb480d0..0d6efde4 100755
--- a/scripts/vphone_jb_setup.sh
+++ b/scripts/vphone_jb_setup.sh
@@ -107,8 +107,15 @@ done
if [ -n "$DROPBEARKEY" ]; then
[ -f /var/dropbear/dropbear_rsa_host_key ] || "$DROPBEARKEY" -t rsa -f /var/dropbear/dropbear_rsa_host_key >/dev/null
[ -f /var/dropbear/dropbear_ecdsa_host_key ] || "$DROPBEARKEY" -t ecdsa -f /var/dropbear/dropbear_ecdsa_host_key >/dev/null
- chmod 0600 /var/dropbear/dropbear_rsa_host_key /var/dropbear/dropbear_ecdsa_host_key
- log " dropbear host keys ready"
+ if [ -f /var/dropbear/dropbear_rsa_host_key ] && [ -f /var/dropbear/dropbear_ecdsa_host_key ]; then
+ if chmod 0600 /var/dropbear/dropbear_rsa_host_key /var/dropbear/dropbear_ecdsa_host_key; then
+ log " dropbear host keys ready"
+ else
+ log " WARNING: dropbear host key chmod failed"
+ fi
+ else
+ log " WARNING: dropbear host key generation incomplete"
+ fi
else
log " WARNING: dropbearkey not found"
fi