diff --git a/zen/tools/nodename b/zen/tools/nodename index 9c827da..15313b9 100755 --- a/zen/tools/nodename +++ b/zen/tools/nodename @@ -35,16 +35,16 @@ export isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6- export myRouter=$(sudo route -n | grep ' UG ' | tail -n 1 | awk '{print $2}') # Ask to the router my name (BOX DNS or system defined) -[[ $isLAN ]] && export NODENAME=$(sudo nslookup $myIP $myRouter | grep 'name =' | awk -F ' = ' '{print $2}' | sed 's/\.$//') \ -|| export NODENAME=$(sudo nslookup $myIP | grep 'name =' | awk -F ' = ' '{print $2}' | sed 's/\.$//') +[[ $isLAN ]] && export NODENAME=$(sudo nslookup $myIP $myRouter -timeout=2 | grep 'name =' | awk -F ' = ' '{print $2}' | sed 's/\.$//') \ +|| export NODENAME=$(sudo nslookup $myIP -timeout=2 | grep 'name =' | awk -F ' = ' '{print $2}' | sed 's/\.$//') if [[ -z "$NODENAME" && "$WAN" == "-w" ]]; then IP=`wget --quiet http://brouits.free.fr/ip.php -O- | sed 's/\r//'` - NODENAME=`nslookup $IP | head -1 | cut -d'=' -f 2 | sed -E 's/^ *(.*)\.$/\1/'` + NODENAME=`nslookup $IP -timeout=2 | head -1 | cut -d'=' -f 2 | sed -E 's/^ *(.*)\.$/\1/'` fi # We must have that nodename, perhaps BOX DNS doesn't exist... -[[ $NODENAME == "" ]] && [[ $isLAN ]] && export NODENAME=$(sudo nslookup $myIP | grep 'name =' | awk -F ' = ' '{print $2}' | sed 's/\.$//') +[[ $NODENAME == "" ]] && [[ $isLAN ]] && export NODENAME=$(sudo nslookup $myIP -timeout=2 | grep 'name =' | awk -F ' = ' '{print $2}' | sed 's/\.$//') # OK no DNS is answering, let's be /etc/hostname [[ $NODENAME == "" ]] && NODENAME=$(cat /etc/hostname)