diff options
| author | tv <tv@iiso> | 2011-09-15 00:20:03 +0200 |
|---|---|---|
| committer | tv <tv@iiso> | 2011-09-15 00:20:03 +0200 |
| commit | 6a6ab5406787dd11f24e1ae9d76ead16185866b4 (patch) | |
| tree | 46ae7825abef4d9826e9312cf0971f019bf5f548 | |
| parent | 7bda8401a2d902d8eeb63a75123e72428ee2b2b5 (diff) | |
| parent | e325a597a3ecc2a267bb904a36952ea2032b8ad4 (diff) | |
Merge branch 'master' of github.com:krebscode/painload
| -rwxr-xr-x | punani/bin/punani | 4 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/install.sh | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/punani/bin/punani b/punani/bin/punani index 7278e38a..d118b13c 100755 --- a/punani/bin/punani +++ b/punani/bin/punani @@ -190,11 +190,11 @@ EOF punani (){ ns=punani role=undefined - while getopts 'dfhvSsopEir' OPT; do + while getopts 'dfhvSsopEir?' OPT; do case $OPT in (f) force=true; continue;; (h) hard=true; continue;; - (v) verbose=true; continue;; + (v) set -x; continue;; (d) dryrun=true; continue;; (\?) help;continue ;; esac diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh index 526dbe1f..547cf366 100755 --- a/retiolum/scripts/tinc_setup/install.sh +++ b/retiolum/scripts/tinc_setup/install.sh @@ -56,6 +56,7 @@ Name = $myname ConnectTo = supernode ConnectTo = kaah ConnectTo = pa_sharepoint +ConnectTo = EUcancER Device = /dev/net/tun EOF |