From 3f0cbf92420f1f7ddcf8600da1d3a71eedcdad59 Mon Sep 17 00:00:00 2001
From: vhsdream <punk.sand7393@fastmail.com>
Date: Sun, 9 Nov 2025 11:28:29 -0500
Subject: [PATCH] Netvisor: use specified toolchain

---
 ct/netvisor.sh              | 7 +++++--
 install/netvisor-install.sh | 8 +++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ct/netvisor.sh b/ct/netvisor.sh
index be0cc276d..68b9ec1ec 100644
--- a/ct/netvisor.sh
+++ b/ct/netvisor.sh
@@ -40,6 +40,9 @@ function update_script() {
 
     CLEAN_INSTALL=1 fetch_and_deploy_gh_release "netvisor" "mayanayza/netvisor" "tarball" "latest" "/opt/netvisor"
 
+    TOOLCHAIN="$(grep "channel" /opt/netvisor/backend/rust-toolchain.toml | awk '{print $3}')"
+    RUST_TOOLCHAIN=$TOOLCHAIN setup_rust
+
     mv /opt/netvisor.env /opt/netvisor/.env
     msg_info "Creating frontend UI"
     export PUBLIC_SERVER_HOSTNAME=default
@@ -49,12 +52,12 @@ function update_script() {
     $STD npm run build
     msg_ok "Created frontend UI"
 
-    msg_info "Building backend server (patience)"
+    msg_info "Building Netvisor-server (patience)"
     cd /opt/netvisor/backend
     $STD cargo build --release --bin server
     mv ./target/release/server /usr/bin/netvisor-server
     chmod +x /usr/bin/netvisor-server
-    msg_ok "Built backend server"
+    msg_ok "Built Netvisor-server"
 
     msg_info "Building Netvisor-daemon (amd64 version)"
     $STD cargo build --release --bin daemon
diff --git a/install/netvisor-install.sh b/install/netvisor-install.sh
index eed918d35..c3433b0f9 100644
--- a/install/netvisor-install.sh
+++ b/install/netvisor-install.sh
@@ -18,7 +18,6 @@ $STD apt install -y \
   build-essential
 msg_ok "Installed Dependencies"
 
-setup_rust
 PG_VERSION=17 setup_postgresql
 NODE_VERSION="24" setup_nodejs
 
@@ -40,6 +39,9 @@ msg_ok "Set up PostgreSQL Database"
 
 fetch_and_deploy_gh_release "netvisor" "mayanayza/netvisor" "tarball" "latest" "/opt/netvisor"
 
+TOOLCHAIN="$(grep "channel" /opt/netvisor/backend/rust-toolchain.toml | awk '{print $3}')"
+RUST_TOOLCHAIN=$TOOLCHAIN setup_rust
+
 msg_info "Creating frontend UI"
 export PUBLIC_SERVER_HOSTNAME=default
 export PUBLIC_SERVER_PORT=60072
@@ -48,12 +50,12 @@ $STD npm ci --no-fund --no-audit
 $STD npm run build
 msg_ok "Created frontend UI"
 
-msg_info "Building backend server (patience)"
+msg_info "Building Netvisor-server (patience)"
 cd /opt/netvisor/backend
 $STD cargo build --release --bin server
 mv ./target/release/server /usr/bin/netvisor-server
 chmod +x /usr/bin/netvisor-server
-msg_ok "Built backend server"
+msg_ok "Built Netvisor-server"
 
 msg_info "Building Netvisor-daemon (amd64 version)"
 $STD cargo build --release --bin daemon