clear badboots on install, wait for server for 120 seconds and make a…

… log if it fails
unknown321 · Jan 19, 2025 · 1d404dc · 1d404dc
1 parent 1fd70b3
commit 1d404dc
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/installer/run.sh b/installer/run.sh
@@ -15,6 +15,18 @@ log()
         IFS=$oldIFS
 }
 
+clearBadBoots() {
+  if ! test -f /contents/wampy/config.ini; then
+    log "no previous config found"
+    return
+  fi
+
+  log "badboots = $(busybox grep badboots /contents/wampy/config.ini)"
+  log "resetting badboots to 0"
+  busybox sed -i 's/badboots.*/badboots = 0/g' /contents/wampy/config.ini
+  log "badboots = $(busybox grep badboots /contents/wampy/config.ini)"
+}
+
 install() {
   log "installing ${BINARY}"
   mkdir -p ${VENDOR}/bin/
@@ -109,6 +121,8 @@ install() {
   log "installing llusbdac"
   mkdir -p ${VENDOR}/modules/
   cp llusbdac.ko ${VENDOR}/modules/
+
+  clearBadBoots
 }
 
 log "installing $(cat product_info)"

diff --git a/src/main.cpp b/src/main.cpp
@@ -423,6 +423,7 @@ int main(int, char **) {
         exit(1);
     }
 
+    auto now = std::time(nullptr);
     while (true) {
         struct stat st {};
         if (stat(socket.c_str(), &st) == 0) {
@@ -431,6 +432,12 @@ int main(int, char **) {
             nanosleep(&tw, nullptr);
             DLOG("waiting for socket %s\n", socket.c_str());
         }
+
+        if (std::time(nullptr) - now > 120) {
+            DLOG("wampy socket timeout, %s\n", socket.c_str());
+            createDump();
+            exit(1);
+        }
     }
 
     connector->Start();