diff options
| author | EUcancER <root@euer.krebsco.de> | 2012-12-27 23:46:49 +0100 |
|---|---|---|
| committer | EUcancER <root@euer.krebsco.de> | 2012-12-27 23:46:49 +0100 |
| commit | 40cc00afcf0564815edee4810b908847affc4832 (patch) | |
| tree | e7f4526b0364c2f16c489c5c90d56ccc70204a60 | |
| parent | c73b44e358627551dfb4835c5eb0620078e6e9fc (diff) | |
| parent | 72be0c40f7bf594887364bf3dcb7774f99849b24 (diff) | |
Merge branch 'master' of github.com:krebscode/painload
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index fadfa9f7..0a49c983 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -18,6 +18,7 @@ NETNAME=${NETNAME:-retiolum} MASK4=${MASK4:-16} MASK6=${MASK6:-16} URL=${URL:-http://euer.krebsco.de/retiolum/hosts.tar.gz} +SURL=${SURL:-http://euer.krebsco.de/retiolum/supernodes.tar.gz} IRCCHANNEL=${IRCCHANNEL:-"#krebsco"} IRCSERVER=${IRCSERVER:-"irc.freenode.net"} @@ -120,7 +121,7 @@ get_hostname() #os autodetection find_os() { - if grep -qe 'Linux' /etc/*release 2>/dev/null || grep -qe 'Linux' /etc/issue ; then + if grep -qe 'Linux' /etc/*release 2>/dev/null || grep -qe 'Linux' /etc/issue 2>/dev/null; then OS=1 elif type getprop >/dev/null; then OS=2 @@ -310,7 +311,7 @@ cd $TINCDIR/$NETNAME if [ $OS -eq 3 ]; then mkdir hosts - $LOADER http://euer.krebsco.de/retiolum/supernodes.tar.gz | tar xz -C hosts/ + $LOADER $SURL | tar xz -C hosts/ else mv $TEMPDIR/hosts ./ fi |