From b1cd86d94c5edf98eb17deb6d6bad6c77ec934e4 Mon Sep 17 00:00:00 2001 From: Poil Date: Sun, 25 Jan 2015 21:53:14 +0100 Subject: [PATCH] Get all ip if ip=0.0.0.0 --- functions/fn_autoip | 15 +++------------ functions/fn_check_ip | 21 ++++----------------- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/functions/fn_autoip b/functions/fn_autoip index 6f38ec317..4af782c2b 100644 --- a/functions/fn_autoip +++ b/functions/fn_autoip @@ -12,17 +12,8 @@ if [ ! -f /bin/ip ]; then else ipcommand="ip" fi -getip=$(${ipcommand} -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|grep -v 127.0.0) -getipwc=$(${ipcommand} -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|grep -vc 127.0.0) +getip=$(hostname -I) if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then - if [ "${getipwc}" -ge "2" ]; then - fn_printwarn "Multiple active network interfaces found.\n\n" - echo -en "Manually specify the IP you want to use within the ${selfname} script.\n" - echo -en "Set ip=\"0.0.0.0\" to one of the following:\n" - echo -en "${getip}\n" - exit - else - ip=${getip} - fi -fi \ No newline at end of file + ip=${getip} +fi diff --git a/functions/fn_check_ip b/functions/fn_check_ip index f0ec52970..e5b2755c9 100644 --- a/functions/fn_check_ip +++ b/functions/fn_check_ip @@ -7,22 +7,9 @@ # Description: Automatically identifies the server interface IP. # If multiple interfaces are detected the user will need to manualy set using ip="0.0.0.0". -if [ ! -f /bin/ip ]; then - ipcommand="/sbin/ip" -else - ipcommand="ip" -fi -getip=$(${ipcommand} -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|grep -v 127.0.0) -getipwc=$(${ipcommand} -o -4 addr|awk '{print $4 }'|grep -oe '\([0-9]\{1,3\}\.\?\)\{4\}'|grep -vc 127.0.0) +getip=$(hostname -I) if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then - if [ "${getipwc}" -ge "2" ]; then - fn_printwarn "Multiple active network interfaces found.\n\n" - echo -en "Manually specify the IP you want to use within the ${selfname} script.\n" - echo -en "Set ip=\"0.0.0.0\" to one of the following:\n" - echo -en "${getip}\n" - exit - else - ip=${getip} - fi -fi \ No newline at end of file + ip=${getip} +fi +