From 9784fc24d1502e7b685f8f273165ab76166a8f52 Mon Sep 17 00:00:00 2001
From: crowetic <jason@crowetic.com>
Date: Mon, 28 Apr 2025 11:30:01 -0700
Subject: [PATCH] Modified the vm setup script so that it doesn't concern
 itself with the nic config, that should only be needed in very rare cases,
 and should more likely be needed on underlying hypervisor only. Keeping code
 for historical purposes commented out.

---
 vm-tool-setup.sh | 73 ++++++++++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/vm-tool-setup.sh b/vm-tool-setup.sh
index 8370243..92037b2 100755
--- a/vm-tool-setup.sh
+++ b/vm-tool-setup.sh
@@ -2,7 +2,8 @@
 
 set -euo pipefail
 
-echo "=== [1/5] Installing essentials ==="
+echo "=== [1/5] Installing essentials and disabling pro notifications==="
+sudo pro config set apt_news=false
 sudo apt update
 sudo apt -y upgrade
 sudo apt install -y qemu-guest-agent util-linux haveged ethtool lshw dmidecode
@@ -13,51 +14,51 @@ sudo systemctl enable --now qemu-guest-agent
 echo "=== [3/5] Trimming filesystems ==="
 sudo fstrim -av || true
 
-echo "=== [4/5] Creating conditional NIC tuning script ==="
-TUNER_SCRIPT="/usr/local/sbin/conditional-nic-tuning.sh"
+# echo "=== [4/5] Creating conditional NIC tuning script ==="
+# TUNER_SCRIPT="/usr/local/sbin/conditional-nic-tuning.sh"
 
-sudo tee "$TUNER_SCRIPT" > /dev/null <<'EOSCRIPT'
-#!/bin/bash
-set -euo pipefail
+# sudo tee "$TUNER_SCRIPT" > /dev/null <<'EOSCRIPT'
+# #!/bin/bash
+# set -euo pipefail
 
-HYPERVISOR=$(systemd-detect-virt)
-BROADCOM_FOUND=$(lspci | grep -i "broadcom" || true)
+# HYPERVISOR=$(systemd-detect-virt)
+# BROADCOM_FOUND=$(lspci | grep -i "broadcom" || true)
 
-if [[ "$HYPERVISOR" == "kvm" && -n "$BROADCOM_FOUND" ]]; then
-  echo "✅ Broadcom NIC on KVM detected — applying NIC tuning"
+# if [[ "$HYPERVISOR" == "kvm" && -n "$BROADCOM_FOUND" ]]; then
+#   echo "✅ Broadcom NIC on KVM detected — applying NIC tuning"
 
-  for nic in /sys/class/net/*; do
-    name=$(basename "$nic")
-    [[ "$name" =~ ^(lo|vmbr|tap|veth|docker) ]] && continue
+#   for nic in /sys/class/net/*; do
+#     name=$(basename "$nic")
+#     [[ "$name" =~ ^(lo|vmbr|tap|veth|docker) ]] && continue
 
-    echo "→ Tuning $name"
-    /usr/sbin/ethtool -K "$name" tx off rx off tso off gso off gro off || true
-    /sbin/ip link set "$name" txqueuelen 10000 || true
-  done
-else
-  echo "❌ Skipping NIC tuning — not KVM with Broadcom NIC"
-fi
-EOSCRIPT
+#     echo "→ Tuning $name"
+#     /usr/sbin/ethtool -K "$name" tx off rx off tso off gso off gro off || true
+#     /sbin/ip link set "$name" txqueuelen 10000 || true
+#   done
+# else
+#   echo "❌ Skipping NIC tuning — not KVM with Broadcom NIC"
+# fi
+# EOSCRIPT
 
-sudo chmod +x "$TUNER_SCRIPT"
+# sudo chmod +x "$TUNER_SCRIPT"
 
-echo "=== [5/5] Creating systemd service file ==="
-SERVICE_FILE="/etc/systemd/system/conditional-nic-offload.service"
+# echo "=== [5/5] Creating systemd service file ==="
+# SERVICE_FILE="/etc/systemd/system/conditional-nic-offload.service"
 
-sudo tee "$SERVICE_FILE" > /dev/null <<EOF
-[Unit]
-Description=Disable NIC offloads only if KVM + Broadcom detected
-After=network-online.target
-Wants=network-online.target
+# sudo tee "$SERVICE_FILE" > /dev/null <<EOF
+# [Unit]
+# Description=Disable NIC offloads only if KVM + Broadcom detected
+# After=network-online.target
+# Wants=network-online.target
 
-[Service]
-Type=oneshot
-ExecStart=$TUNER_SCRIPT
-RemainAfterExit=yes
+# [Service]
+# Type=oneshot
+# ExecStart=$TUNER_SCRIPT
+# RemainAfterExit=yes
 
-[Install]
-WantedBy=multi-user.target
-EOF
+# [Install]
+# WantedBy=multi-user.target
+# EOF
 
 echo "=== Reloading systemd and enabling service ==="
 sudo systemctl daemon-reexec