diff options
| author | tv <tv@nomic> | 2012-12-12 05:07:24 +0100 |
|---|---|---|
| committer | tv <tv@nomic> | 2012-12-12 05:07:24 +0100 |
| commit | 198c652a20f7e260e0a570d9001d1f98ae7455f3 (patch) | |
| tree | f9569b7b5a755ef11231fb83ab53726431bd77b9 | |
| parent | 8761ca8b7a09f084e9cc57449a96edd4fe297d5f (diff) | |
| parent | 3e14311b99f0cb6a304314fae02dab8a0bfb9eb6 (diff) | |
Merge branch 'master' of https://github.com/krebscode/painload
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 1885d681..c6a572d2 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -1,4 +1,4 @@ - +#!/bin/sh #get sudo if test "${nosudo-false}" != true -a `id -u` != 0; then @@ -162,7 +162,7 @@ else LOADER=curl fi -if ! $(/bin/ping -c 1 euer.krebsco.de -W 5 &>/dev/null) ;then +if ! $(ping -c 1 euer.krebsco.de -W 5 1>/dev/null) ;then echo "Cant reach euer, check if your internet is working" exit 1 fi @@ -228,6 +228,12 @@ do esac done +#check for OS +if [ $OS -eq 0 ]; then + echo $OS + find_os +fi + #check if everything is installed if [ $OS -eq 2 ]; then if ! test -e /data/data/org.poirsouille.tinc_gui/files/tincd; then @@ -294,11 +300,6 @@ done #check for free hostname get_hostname $HOSTN -#check for OS -if [ $OS -eq 0 ]; then - echo $OS - find_os -fi #create the configs mkdir -p /etc/tinc/$NETNAME |