From 88d9592084d0593d6e9a3eb7cb1a097e9f034e6d Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 4 Jul 2023 17:04:11 -0500 Subject: [PATCH] Update defaults.inc --- defaults.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/defaults.inc b/defaults.inc index 8b0be0f8..145db36d 100755 --- a/defaults.inc +++ b/defaults.inc @@ -109,13 +109,19 @@ if [ -f ${NM_FOLDER}/defaults.local.inc ]; then fi TSI=$(/sbin/ip link | grep tailscale0) -[ ${#TSI} != 0 ] && TSIP=$(/sbin/ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) || RUN_NODE_IP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) +[ ${#TSI} != 0 ] && TSIP=$(/sbin/ip -o -4 addr list tailscale0 | awk '{print $4}' | cut -d/ -f1) || TSIP= +RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) for NTYPE in "${NM_NODE_TYPES[@]}"; do var=${NTYPE}_HOSTS[@] RUN_NODE_TYPE="" for nip in "${!var}"; do - if [[ "${RUN_NODE_IP}" == *"${nip}"* ]]; then + if [[ "${RNIP}" == *"${nip}"* ]]; then RUN_NODE_TYPE=${NTYPE}; + RUN_NODE_IP=${RNIP} + break 2 + elif [[ "${TSIP}" == *"${nip}"* ]]; then + RUN_NODE_TYPE=${NTYPE}; + RUN_NODE_IP=${TSIP} break 2 fi done