diff options
| author | krebs <krebs@fuerkrebs> | 2011-11-08 17:14:03 -0500 |
|---|---|---|
| committer | krebs <krebs@fuerkrebs> | 2011-11-08 17:14:03 -0500 |
| commit | 7bef2d4da84b6fb2ca2235a8058cec9150d69cbe (patch) | |
| tree | 8adcf21febfc2e2008fc89cc5f454a7586f1d26e /retiolum/scripts/tinc_setup | |
| parent | 8fd3f1126b66aed4801fa896d72b09f2f7702dce (diff) | |
| parent | 58ec181dd1cd17997e35fb64ec2088fa4b2181dd (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'retiolum/scripts/tinc_setup')
| -rwxr-xr-x | retiolum/scripts/tinc_setup/install.sh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh index a550a068..2198589b 100755 --- a/retiolum/scripts/tinc_setup/install.sh +++ b/retiolum/scripts/tinc_setup/install.sh @@ -22,11 +22,15 @@ echo "added known hosts:" ls -1 hosts | LC_ALL=C sort echo "delete the nodes you do not trust!" +hostname="${HOSTNAME-`cat /etc/hostname`}" myname="${1:-}" if [ ! "$myname" ] then - echo "select username: " + printf "select node name [$hostname]: " read myname + if test -z "$myname"; then + myname="$hostname" + fi fi if [ ! -e "hosts/$myname" ] then @@ -35,11 +39,13 @@ then if [ ! "$myipv4" ] then - echo "select v4 subnet ip (1-255) :" + printf 'select v4 subnet ip (1-255): ' read v4num - if ! $MYBIN/check-free-retiolum-v4 $v4num;then - exit 1 - fi + until $MYBIN/check-free-retiolum-v4 $v4num; do + echo "your're an idiot!" + printf 'select unused v4 subnet ip (1-255): ' + read v4num + done myipv4="10.7.7.$v4num" fi echo "Subnet = $myipv4" > hosts/$myname |