updates for agnos 0.6

commaai · Feb 18, 2021 · 2aa229b · 2aa229b
1 parent d4feecd
commit 2aa229b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/common/params_pyx.pyx b/common/params_pyx.pyx
@@ -58,6 +58,7 @@ keys = {
   b"ReleaseNotes": [TxType.PERSISTENT],
   b"ShouldDoUpdate": [TxType.CLEAR_ON_MANAGER_START],
   b"SubscriberInfo": [TxType.PERSISTENT],
+  b"SshEnabled": [TxType.PERSISTENT],
   b"TermsVersion": [TxType.PERSISTENT],
   b"Timezone": [TxType.PERSISTENT],
   b"TrainingVersion": [TxType.PERSISTENT],

diff --git a/selfdrive/ui/qt/offroad/networking.cc b/selfdrive/ui/qt/offroad/networking.cc
@@ -7,6 +7,7 @@
 #include <QRandomGenerator>
 #include <QtConcurrent>
 
+#include "common/params.h"
 #include "networking.hpp"
 #include "util.h"
 
@@ -280,14 +281,12 @@ void AdvancedNetworking::toggleTethering(int enable) {
 }
 
 void enableSSH(Toggle* toggle_switch_SSH){
-  system("sudo systemctl enable ssh");
-  system("sudo systemctl start ssh");
+  Params().write_db_value("SshEnabled", "1");
   toggle_switch_SSH->setEnabled(true);
 }
 
 void disableSSH(Toggle* toggle_switch_SSH){
-  system("sudo systemctl stop ssh");
-  system("sudo systemctl disable ssh");
+  Params().write_db_value("SshEnabled", "0");
   toggle_switch_SSH->setEnabled(true);
 }
 

diff --git a/selfdrive/ui/qt/setup/installer.cc b/selfdrive/ui/qt/setup/installer.cc
@@ -25,18 +25,16 @@ int fresh_clone() {
   int err;
 
   // Cleanup
-  err = std::system("rm -rf /tmp/openpilot /data/openpilot");
+  err = std::system("rm -rf /data/tmppilot /data/openpilot");
   if (err) return 1;
 
   // Clone
-  err = std::system("git clone " GIT_URL " -b " BRANCH " --depth=1 /tmp/openpilot");
+  err = std::system("git clone " GIT_URL " -b " BRANCH " --depth=1 --recurse-submodules /data/tmppilot");
   if (err) return 1;
-  err = std::system("cd /tmp/openpilot && git submodule update --init");
-  if (err) return 1;
-  err = std::system("cd /tmp/openpilot && git remote set-url origin --push " GIT_SSH_URL);
+  err = std::system("cd /data/tmppilot && git remote set-url origin --push " GIT_SSH_URL);
   if (err) return 1;
 
-  err = std::system("mv /tmp/openpilot /data");
+  err = std::system("mv /data/tmppilot /data/openpilot");
   if (err) return 1;
 
 #ifdef SSH_KEYS