From ded757b8d56b49b45d13aea53307d2ea4acc20e9 Mon Sep 17 00:00:00 2001
From: deadcxap <36386824+deadcxap@users.noreply.github.com>
Date: Sun, 24 Aug 2025 22:39:21 +0300
Subject: [PATCH] Delay unattended upgrades and wait for apt before Netbird

---
 setup.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index e1b4f36..d23f205 100644
--- a/setup.sh
+++ b/setup.sh
@@ -25,6 +25,12 @@ run() {
   fi
 }
 
+wait_for_apt() {
+  while fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1; do
+    sleep 1
+  done
+}
+
 print_summary() {
   echo "\n==== Итоговая сводка ===="
   for item in "${SUMMARY[@]}"; do
@@ -217,6 +223,7 @@ EOF"
 
 install_netbird() {
   [[ -z "$NETBIRD_KEY" ]] && return
+  wait_for_apt
   run "Installing Netbird" bash -c "curl -fsSL https://pkgs.netbird.io/install.sh | sh"
   run "Starting Netbird" netbird up --setup-key "$NETBIRD_KEY"
   run "Checking Netbird service" systemctl is-active --quiet netbird
@@ -287,7 +294,6 @@ setup_role() {
 main() {
   install_packages
   setup_timezone
-  setup_unattended_upgrades
   create_user
   configure_ssh
   configure_ufw
@@ -297,6 +303,7 @@ main() {
   install_netbird
   setup_vector
   setup_role
+  setup_unattended_upgrades
 }
 
 main