From 1fd81f80fdf2cfdb99b601471c4054784162dc43 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 12 Sep 2025 15:01:56 -0500 Subject: [PATCH] Update defaults.inc --- defaults.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/defaults.inc b/defaults.inc index f1c05bb8..120c0636 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.6.23-08302025' +VERS='5.6.24-09122025' NM_BETA=false @@ -10,9 +10,9 @@ declare -i errtime [ "${NM_FOLDER}" == "" ] && NM_FOLDER=/opt/idssys/nodemgmt NM_SRVCOPT=(start stop restart reload enable disable) -TSI=$(/sbin/ip link | grep tailscale0) -[ ${#TSI} != 0 ] && RUN_NODE_TSIP=$(/sbin/ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) || RUN_NODE_TSIP="" -echo "TSI=${TSI}" +# TSI=$(/sbin/ip link | grep tailscale0) +# [ ${#TSI} != 0 ] && RUN_NODE_TSIP=$(/sbin/ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) || RUN_NODE_TSIP="" + if [ "$(ip route | awk '/default/ { print $5 }')" == "link" ]; then RNIP=$(ip addr show $(ip route | awk '/1 dev eth0/ { print $5; exit }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) @@ -155,10 +155,10 @@ fi RUN_NODE_TYPE=${NTYPE}; RUN_NODE_IP=${RNIP} break 2 - elif [[ "${RUN_NODE_TSIP}" == *"${nip}"* ]]; then - RUN_NODE_TYPE=${NTYPE}; - RUN_NODE_IP=${RNIP} - break 2 + # elif [[ "${RUN_NODE_TSIP}" == *"${nip}"* ]]; then + # RUN_NODE_TYPE=${NTYPE}; + # RUN_NODE_IP=${RNIP} + # break 2 fi done # fi