From 7215c3242b4a6cbeabc76c03bb8dcd87b8fee6f4 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 1 Apr 2021 22:58:56 -0600
Subject: [PATCH] Connect to WiFi before starting HW Diagnostics

---
 setup/macos/live-macos-startup | 16 ++++++++++++++++
 setup/macos/update-base-image  |  1 +
 2 files changed, 17 insertions(+)

diff --git a/setup/macos/live-macos-startup b/setup/macos/live-macos-startup
index 7a5d5ff5..2c034330 100755
--- a/setup/macos/live-macos-startup
+++ b/setup/macos/live-macos-startup
@@ -18,6 +18,22 @@ if ! [[ -d /Volumes/RAM_Disk ]]; then
 fi
 cd /Volumes/RAM_Disk
 
+# Connect to WiFi?
+if ! [[ -e /Volumes/RAM_Disk/.wifi ]]; then
+  WIFI_NET="$(fgrep ':::' /.known_networks | head -1)"
+  if ! ifconfig | grep -Eq '(((10|172)\.\d+|192.168)\.\d+\.\d+)' 2>/dev/null; then
+    echo "Connecting to WiFi..."
+    NET_DEV="$(/usr/sbin/networksetup \
+      -listallhardwareports \
+      | tr -d '\n' \
+      | grep -Eo 'Wi-Fi.*?Device.*?(en\d+)' \
+      | grep -Eo 'en(\d+)')"
+    networksetup -setairportnetwork "${NET_DEV}" "${WIFI_NET%%:::*}" "${WIFI_NET##*:::}"
+    touch /Volumes/RAM_Disk/.wifi
+    sleep 1s
+  fi
+fi
+
 # Stay awake
 echo "Getting caffeinated..."
 caffeinate -id &
diff --git a/setup/macos/update-base-image b/setup/macos/update-base-image
index f0cc50dd..8a53f720 100755
--- a/setup/macos/update-base-image
+++ b/setup/macos/update-base-image
@@ -79,6 +79,7 @@ rsync -aS /usr/local/share/zsh "${WK_PATH}/usr/local/share"/
 sed -Ei '' 's!^(root.*)/bin/sh!\1/bin/zsh!' "${WK_PATH}/etc/passwd"
 
 # Misc
+cp -a ../linux/known_networks "${WK_PATH}/.known_networks"
 cp -a /bin/rsync "${WK_PATH}/bin"/
 cp -a aliases "${WK_PATH}/.aliases"
 cp -a bashrc "${WK_PATH}/etc/profile"