From 79975a551625d4968919055a571c305f05162022 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Wed, 10 Dec 2008 15:45:08 -0600 Subject: Use route -n instead of route. Relates to FS#51 --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/install_proxy.sh | 11 +++++++++-- abs/core-testing/LinHES-config/myth_user_call | 2 +- abs/mv-core/MythVantage-config/myth_user_call | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index d9f7f20..2a8ad77 100755 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=1.0 -pkgrel=93 +pkgrel=96 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan ) diff --git a/abs/core-testing/LinHES-config/install_proxy.sh b/abs/core-testing/LinHES-config/install_proxy.sh index f106b50..e6b0976 100755 --- a/abs/core-testing/LinHES-config/install_proxy.sh +++ b/abs/core-testing/LinHES-config/install_proxy.sh @@ -436,6 +436,8 @@ echo "-----------------------------------------------------------------------3-- check_self) myipdefault=`ifconfig | grep -C1 $default_interface| grep -v $default_interface | cut -d: -f2 | awk '{ print $1}'` + echo "network check myself" + ifconfig ping -c 1 $myipdefault if [ ! $? = 0 ] then @@ -445,7 +447,10 @@ echo "-----------------------------------------------------------------------3-- ;; check_gw) #check gateway - mygwdefault=`/sbin/route |grep $default_interface|grep UG|awk '{ print $2}'` + echo "network check gateway" + /sbin/route -n + mygwdefault=`/sbin/route -n |grep $default_interface|grep UG|awk '{ print $2}'` + echo "Default gateway seems to be $mygwdefault" if [ ! x$mygwdefault = x ] then ping -c 1 $mygwdefault @@ -457,6 +462,7 @@ echo "-----------------------------------------------------------------------3-- ;; check_ns) #check nameserver + echo " network check nameserver" mydns=`cat /etc/resolv.conf|grep nameserver|head -1|awk '{ print $2}'` ping -c 1 $mydns if [ ! $? = 0 ] @@ -465,6 +471,7 @@ echo "-----------------------------------------------------------------------3-- fi ;; check_names) + echo "network check resolve names" host google.com if [ ! $? = 0 ] then @@ -474,7 +481,7 @@ echo "-----------------------------------------------------------------------3-- host_names) #if host is found, then check to see if it's online #if not online, assume it's ok to use this hostname - + echo "network check my hostname $hostname" hout=`host $hostname` status=$? #found host, now grab the ip diff --git a/abs/core-testing/LinHES-config/myth_user_call b/abs/core-testing/LinHES-config/myth_user_call index 0f899df..0479895 100644 --- a/abs/core-testing/LinHES-config/myth_user_call +++ b/abs/core-testing/LinHES-config/myth_user_call @@ -1,4 +1,4 @@ -GGGGGGGGG#!/bin/bash +#!/bin/bash #Wrapper script to manage USERNAME accounts + web security # myth_USERNAME_all -c add -u USERNAME # myth_USERNAME_all -c delete -u USERNAME diff --git a/abs/mv-core/MythVantage-config/myth_user_call b/abs/mv-core/MythVantage-config/myth_user_call index 0f899df..0479895 100644 --- a/abs/mv-core/MythVantage-config/myth_user_call +++ b/abs/mv-core/MythVantage-config/myth_user_call @@ -1,4 +1,4 @@ -GGGGGGGGG#!/bin/bash +#!/bin/bash #Wrapper script to manage USERNAME accounts + web security # myth_USERNAME_all -c add -u USERNAME # myth_USERNAME_all -c delete -u USERNAME -- cgit v0.12