diff options
| author | makefu <root@pigstarter.de> | 2013-06-18 10:58:25 +0200 |
|---|---|---|
| committer | makefu <root@pigstarter.de> | 2013-06-18 10:58:25 +0200 |
| commit | ad74208e150307d895ef1f78970fa717f78f1b42 (patch) | |
| tree | 10a0c52873be4e4243f311147dfd67d33329c754 | |
| parent | 64795618e52b6739ec03eceb5eb63fe4fb4d8ec6 (diff) | |
| parent | 5a7d622655e554fd8ad7f2ff35ac84f094402341 (diff) | |
Merge branch 'master' of https://github.com/krebscode/painload
| -rwxr-xr-x | infest/profiles/makefu/vim/vimrc | 1 | ||||
| -rw-r--r-- | retiolum/hosts/darth-serious (renamed from retiolum/hosts/darth_serious) | 0 | ||||
| -rw-r--r-- | retiolum/hosts/no-omo (renamed from retiolum/hosts/no_omo) | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 2 |
4 files changed, 2 insertions, 1 deletions
diff --git a/infest/profiles/makefu/vim/vimrc b/infest/profiles/makefu/vim/vimrc index 69ff3f58..123e15a5 100755 --- a/infest/profiles/makefu/vim/vimrc +++ b/infest/profiles/makefu/vim/vimrc @@ -11,6 +11,7 @@ Bundle 'gmarik/vundle' Bundle 'SudoEdit.vim' Bundle 'snipMate' Bundle 'tpope/vim-fugitive' +Bundle 'vim-scripts-iptables' Bundle 'pyflakes' filetype plugin indent on diff --git a/retiolum/hosts/darth_serious b/retiolum/hosts/darth-serious index bcabc5f5..bcabc5f5 100644 --- a/retiolum/hosts/darth_serious +++ b/retiolum/hosts/darth-serious diff --git a/retiolum/hosts/no_omo b/retiolum/hosts/no-omo index d2788d28..d2788d28 100644 --- a/retiolum/hosts/no_omo +++ b/retiolum/hosts/no-omo 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" |