From 133b933dc25a58f1bfae5ebd177eb9125024cd45 Mon Sep 17 00:00:00 2001 From: Hank Leininger Date: Tue, 12 Jul 2016 23:26:58 -0400 Subject: [PATCH 1/2] Gracefully handle ifconfig and route being in /bin/. --- tools/DHCP_Auto.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/DHCP_Auto.sh b/tools/DHCP_Auto.sh index 0e6a12d..012c40b 100644 --- a/tools/DHCP_Auto.sh +++ b/tools/DHCP_Auto.sh @@ -36,12 +36,13 @@ if [ ! -d "/sys/class/net/$1" ]; then fi INTF=$1 -IPADDR=`/sbin/ifconfig $INTF | grep 'inet addr' | tr ':' ' ' | awk '{print $3}'` -NETMASK=`/sbin/ifconfig $INTF | grep 'inet addr' | tr ':' ' ' | awk '{print $7}'` +PATH="$PATH:/sbin" +IPADDR=`ifconfig $INTF | grep 'inet addr' | tr ':' ' ' | awk '{print $3}'` +NETMASK=`ifconfig $INTF | grep 'inet addr' | tr ':' ' ' | awk '{print $7}'` DOMAIN=`grep -E "^domain |^search " /etc/resolv.conf | sort | head -1 | awk '{print $2}'` DNS1=$IPADDR DNS2=`grep ^nameserver /etc/resolv.conf | head -1 | awk '{print $2}'` -ROUTER=`/sbin/route -n | grep ^0.0.0.0 | awk '{print $2}'` +ROUTER=`route -n | grep ^0.0.0.0 | awk '{print $2}'` WPADSTR="http://$IPADDR/wpad.dat" if [ -z "$DOMAIN" ]; then DOMAIN=" " From e19e34997e68a2f567d04d0c013b7870530b7bfd Mon Sep 17 00:00:00 2001 From: Hank Leininger Date: Tue, 12 Jul 2016 23:37:37 -0400 Subject: [PATCH 2/2] Add compatability with newer net-tools ifconfig. The output has changed slightly; this patch should work with older and newer versions of ifconfig. --- tools/DHCP_Auto.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/DHCP_Auto.sh b/tools/DHCP_Auto.sh index 012c40b..c9e264e 100644 --- a/tools/DHCP_Auto.sh +++ b/tools/DHCP_Auto.sh @@ -37,8 +37,8 @@ fi INTF=$1 PATH="$PATH:/sbin" -IPADDR=`ifconfig $INTF | grep 'inet addr' | tr ':' ' ' | awk '{print $3}'` -NETMASK=`ifconfig $INTF | grep 'inet addr' | tr ':' ' ' | awk '{print $7}'` +IPADDR=`ifconfig $INTF | sed -n 's/inet addr/inet/; s/inet[ :]//p' | awk '{print $1}'` +NETMASK=`ifconfig $INTF | sed -n 's/.*[Mm]ask[: ]//p' | awk '{print $1}'` DOMAIN=`grep -E "^domain |^search " /etc/resolv.conf | sort | head -1 | awk '{print $2}'` DNS1=$IPADDR DNS2=`grep ^nameserver /etc/resolv.conf | head -1 | awk '{print $2}'`