summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-05-14 17:43:24 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-05-14 17:43:24 (GMT)
commitff1c4b05fb75ba9372176b0237bf69cc76498412 (patch)
treea3ebdfd926ae83b38bacb26673914f82a9c42143
parentc4a0f6ade8a4b2052acfcfc306c4585082233548 (diff)
downloadlinhes_pkgbuild-ff1c4b05fb75ba9372176b0237bf69cc76498412.zip
linhes_pkgbuild-ff1c4b05fb75ba9372176b0237bf69cc76498412.tar.gz
linhes_pkgbuild-ff1c4b05fb75ba9372176b0237bf69cc76498412.tar.bz2
LinHES-config: install_proxy.sh more debugging for network check, also fix hostname test that always returned true
-rw-r--r--abs/core/LinHES-config/PKGBUILD4
-rwxr-xr-xabs/core/LinHES-config/install_proxy.sh13
2 files changed, 12 insertions, 5 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index ad2e310..e872bcf 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.3
-pkgrel=77
+pkgrel=78
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -109,7 +109,7 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27'
'16b98fcb3753ef6cfc35075c326d30e4'
'e36da536dd651ef182e7642337889e77'
'985891a43f7c4c983eb2a362162f1a0f'
- '3f5693c76c7e483dd3c2184bc2546c82'
+ '13172731c8b08d669336da31cece5775'
'5a31addfbdc1154b05997f972a32fa33'
'c20f73d4da5d7e15e1f3eb85c7dcb49a'
'68199e861c2933ccbb84735b9b440157'
diff --git a/abs/core/LinHES-config/install_proxy.sh b/abs/core/LinHES-config/install_proxy.sh
index 2449874..c2a450d 100755
--- a/abs/core/LinHES-config/install_proxy.sh
+++ b/abs/core/LinHES-config/install_proxy.sh
@@ -137,14 +137,18 @@ case $1 in
#if host is found, then check to see if it's online
#if hoip matchs my ip assume it's ok
echo "network check my hostname $hostname"
- hout=`host $hostname|head -n1`
+ echo "Check of hostname with host: $hout"
+ host $hostname
status=$?
+
+ hout=`host $hostname|head -n1`
hoip=`echo $hout|awk '{print $4}'`
if [ $hoip = found: ]
then
status=1
fi
+
if [ $hoip = "out;" ]
then
#;; connection timed out; no servers could be reached
@@ -152,8 +156,11 @@ case $1 in
status=1
fi
- unkownhost=`host unkown.linhes.org |head -n1 `
- unkownhostip=`echo $unkownhost |awk '{print $4}'`
+ if [ $status = 0 ]
+ then
+ unkownhost=`host unkown.linhes.org |head -n1 `
+ unkownhostip=`echo $unkownhost |awk '{print $4}'`
+ fi
#found host, now grab the ip
if [ $status = 0 ]