summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@darth_serious>2013-06-17 16:11:27 +0200
committerroot <root@darth_serious>2013-06-17 16:11:27 +0200
commit1e8592ab9ee5b9e8c5963a0bbed7cecb225e79ca (patch)
treee20025d5b9ff4319c4ce9f58c940043d500b2774
parent6f38388c11f1e177dab8f40692902eb416818678 (diff)
parentba28a4f406734c4c70aa502cf4043daa9c3cf182 (diff)
Merge branch 'master' of https://github.com/krebscode/painload
-rw-r--r--retiolum/hosts/cat111
-rwxr-xr-xretiolum/scripts/tinc_setup/new_install.sh2
2 files changed, 1 insertions, 12 deletions
diff --git a/retiolum/hosts/cat1 b/retiolum/hosts/cat1
deleted file mode 100644
index b963a069..00000000
--- a/retiolum/hosts/cat1
+++ /dev/null
@@ -1,11 +0,0 @@
-Subnet = 10.243.173.245
-Subnet = 42:92f1:c30d:0d86:ea9b:3cc6:d7ef:e5ee
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAsWrrRkcZ5ESCuPNOwCp8LZDcpgfqZEb9aFtXhFAJ+RO1cINs7w+x
-YbY3DwaPjSEfUYGbUwc3uV6S12aT5FDvoV7yyZhozFDekh0tPSEIoJNtM9KFw/ZC
-BKNbLRheAdZAjCRgTNNyMVONjixFb6ucE/USRzS4UBpisgMo3A7ZVvqIq44MQGKO
-uvdoZZyqXHxqaGorBadJChb021VJFvsfo0T50UUsbNwHXPPdWcZPxBq3zwgjwqyl
-hLEqNbSUjGmg7kCj0LbpuT4o0kwnrrNQYgQtosp36hh8z6kEQnQcon1qoFptPOSh
-PROgi4tUiizXfneGbCTwslxHcGTJOv5I/QIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 5999a5c8..76ed9e70 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -121,7 +121,7 @@ find_os()
}
find_telnet(){
- if exists elnet >/dev/null;then
+ if exists telnet >/dev/null;then
TELNET="`command -v telnet`"
elif exists busybox >/dev/null;then
TELNET="`command -v busybox` telnet"