diff options
| author | Lassulus <lassulus@googlemail.com> | 2012-12-27 23:08:48 +0100 |
|---|---|---|
| committer | Lassulus <lassulus@googlemail.com> | 2012-12-27 23:08:48 +0100 |
| commit | 7b85d4ba396f058aea5b1fb0dc6562524c7d5e7b (patch) | |
| tree | 67afd2718a4f162a62ff88c29f282cdcf7934fc4 | |
| parent | 0080bb1059ad5402500c747d56c19a175604ddda (diff) | |
| parent | 40fd72b29db01d71a4597aec9f153e7e3c7e4a62 (diff) | |
Merge branch 'master' of github.com:krebscode/painload
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 3f904871..b24a28a0 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -6,7 +6,7 @@ if test "${nosudo-false}" != true -a `id -u` != 0; then exec sudo -E "$0" "$@" exit 23 # go to hell fi - +set -euf # SUBNET4=${SUBNET4:-10.243} SUBNET6=${SUBNET6:-42} @@ -49,7 +49,7 @@ Options: -t \$DIR Choose another Temporary directory, default is /tmp/tinc-install-fu -o \$HOST Choose another Hostname, default is your system hostname -n \$NET Choose another tincd netname,this also specifies the path to your tinc config, default is retiolum - -u \$URL specify another hostsfiles.tar.gz url, default is euer.krebsco.de/retiolum/hosts.tar.gz + -u \$URL specify another hostsfiles.tar.gz url, default is http://euer.krebsco.de/retiolum/hosts.tar.gz -l \$OS specify an OS, numeric parameter.0=Automatic 1=Linux 2=Android, disables automatic OS-finding, default is 0 -r \$ADDR give the node an reachable remote address, ipv4 or dns EOF @@ -266,7 +266,7 @@ fi #get tinc-hostfiles mkdir -p $TEMPDIR/hosts -$LOADER euer.krebsco.de/retiolum/hosts.tar.gz | tar zx -C $TEMPDIR/hosts/ +$LOADER $URL | tar zx -C $TEMPDIR/hosts/ #check for free ip #version 4 @@ -315,7 +315,7 @@ else mv $TEMPDIR/hosts ./ fi -rm -r $TEMPDIR +rm -r $TEMPDIR || echo "$TEMPDIR does not exist, skipping removal" echo "Subnet = $IP4" > hosts/$HOSTN echo "Subnet = $IP6" >> hosts/$HOSTN |