diff options
| author | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:28:11 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:29:02 (GMT) |
| commit | d9a08ac22f9c6661cf3b478927be321274d10794 (patch) | |
| tree | 9292ac41e1d3dd341411cf25a4854562e4619d38 /abs/core/LinHES-config | |
| parent | e114480cade2f8390c395e2fa5c9b54ee7f95746 (diff) | |
| download | linhes_pkgbuild-d9a08ac22f9c6661cf3b478927be321274d10794.zip linhes_pkgbuild-d9a08ac22f9c6661cf3b478927be321274d10794.tar.gz linhes_pkgbuild-d9a08ac22f9c6661cf3b478927be321274d10794.tar.bz2 | |
LinHES-config: fix auto nfs between master and FE.
also tweak network check so hopefully it's a little faster
Diffstat (limited to 'abs/core/LinHES-config')
| -rw-r--r-- | abs/core/LinHES-config/PKGBUILD | 8 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/install_proxy.sh | 18 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/mv_advanced.py | 1 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/mv_misc.py | 2 |
4 files changed, 21 insertions, 8 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 96771e2..a4cec3b 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.3 -pkgrel=9 +pkgrel=22 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' @@ -105,7 +105,7 @@ md5sums=('6259677916192a92d1adf47b276f7829' '16b98fcb3753ef6cfc35075c326d30e4' 'e36da536dd651ef182e7642337889e77' '985891a43f7c4c983eb2a362162f1a0f' - 'd7a8cd4a0060399ae22e69f74e04eb07' + '2f0b85d37b15956b3d92419c886e040c' 'd705eb26cd25862bf0e84cc9964bd3db' 'c20f73d4da5d7e15e1f3eb85c7dcb49a' '8ac1cfd2eca0f641737da0d0aca416a7' @@ -122,11 +122,11 @@ md5sums=('6259677916192a92d1adf47b276f7829' '9151c74fcaf18ec4cf5e757cfdbc7017' '3d1e4a119f38cff0498bf8a67e94e4b3' 'fb80a58b1b4cfb26aee48bc991162b40' - 'e6538618f7bb5fb6b79c132803451c39' + '5f3259afe031fda189edae41dd1458f0' '41b03fb1e0a9d9ae7588e3b813212772' 'b845de3e05c1734cce4b9ac5e8f1baaf' '56ca5fd7d6b8d1828c95d13eb0d34de5' - '7a5018c3ce9c6aff3fb26c04ee805ba9' + '5e69839659d65ddda35b8a9982dc29e9' '62b4ce94277c32f525db5c1480670acd' 'ec6a9961e4d1b53ec1240c5979efff11' 'fe5e31b833cc6707209e9d656b6eb53c' diff --git a/abs/core/LinHES-config/install_proxy.sh b/abs/core/LinHES-config/install_proxy.sh index 71b675b..4bb2444 100755 --- a/abs/core/LinHES-config/install_proxy.sh +++ b/abs/core/LinHES-config/install_proxy.sh @@ -88,19 +88,31 @@ case $1 in ;; check_gw) #check gateway + rc=0 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 - sleep 2 - ping -c 5 $mygwdefault - if [ ! $? = 0 ] + #sleep 2 + for i in `seq 10` + do + ping -c 1 $mygwdefault + if [ $? = 0 ] + then + break + rc=1 + fi + done + + + if [ rc = 0 ] then exit 4 fi fi + ;; check_ns) #check nameserver diff --git a/abs/core/LinHES-config/mv_advanced.py b/abs/core/LinHES-config/mv_advanced.py index aa0dcd8..dd00f1d 100755 --- a/abs/core/LinHES-config/mv_advanced.py +++ b/abs/core/LinHES-config/mv_advanced.py @@ -330,6 +330,7 @@ def setup_NFSshares(UseNFS,templatefile): mv_common.pacinstall("nfs-utils") mv_common.pacinstall("rpcbind") cmd = '''sed -e "s/REPLACEME/*/g" %s >/etc/exports''' %templatefile + mv_common.runcmd(cmd) mv_common.add_service("nfsd") mv_common.add_service("nfs-common") mv_common.add_service("rpcbind") diff --git a/abs/core/LinHES-config/mv_misc.py b/abs/core/LinHES-config/mv_misc.py index f49615a..0cbf872 100755 --- a/abs/core/LinHES-config/mv_misc.py +++ b/abs/core/LinHES-config/mv_misc.py @@ -82,7 +82,7 @@ def setup_nfs(systemconfig): else: #if standalone or slave try to use MBE if systemconfig.get("SystemType") == "Frontend_only" or systemconfig["SystemType"] == "Slave_Backend": - item = (systemconfig.get("dbhost") , data_config.DATAMOUNT) + item = (systemconfig.get("dbhost")+":"+ data_config.DATAMOUNT, data_config.DATAMOUNT) nfslist.append(item) setup_nfs_fstab(nfslist) logging.info("__End of nfs\n") |