From e16e4669e4df2253a255a03842c79dc28db5b223 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 4 Jul 2023 17:03:55 -0500 Subject: [PATCH] Update defaults.inc --- defaults.inc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/defaults.inc b/defaults.inc index 145db36d..8b0be0f8 100755 --- a/defaults.inc +++ b/defaults.inc @@ -109,19 +109,13 @@ 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) || TSIP= -RNIP=$(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) || RUN_NODE_IP=$(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 [[ "${RNIP}" == *"${nip}"* ]]; then + if [[ "${RUN_NODE_IP}" == *"${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