wok-6.x rev 18015
dropbear: pppssh may use ssh keys
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat May 02 12:05:22 2015 +0200 (2015-05-02) |
parents | f8eb4005f878 |
children | 5b7188f5cd91 |
files | dropbear/stuff/sshx tazinst/receipt tazlito/receipt tazpkg/receipt |
line diff
1.1 --- a/dropbear/stuff/sshx Sat May 02 05:27:45 2015 +0300 1.2 +++ b/dropbear/stuff/sshx Sat May 02 12:05:22 2015 +0200 1.3 @@ -24,14 +24,16 @@ 1.4 1.5 pppssh() 1.6 { 1.7 - [ -z "$DROPBEAR_PASSWORD" ] && echo -n "ssh password: " && 1.8 - read -s -t 30 DROPBEAR_PASSWORD && export DROPBEAR_PASSWORD 1.9 + ssh="dbclient -y" 1.10 + $ssh $1 true || { 1.11 + [ -z "$DROPBEAR_PASSWORD" ] && echo -n "ssh password: " && 1.12 + read -s -t 30 DROPBEAR_PASSWORD && export DROPBEAR_PASSWORD 1.13 + $ssh $1 true || exit 1 1.14 + } 1.15 for i in $4 ; do 1.16 echo "route add -net $i dev \$1" 1.17 done > /etc/ppp/ip-up.d/pppssh$$ 1.18 chmod +x /etc/ppp/ip-up.d/pppssh$$ 1.19 - ssh="dbclient -y" 1.20 - $ssh $1 true || exit 1 1.21 n=10.$(($$%256)).$(($$/256)) 1.22 ppp="/usr/sbin/pppd local noauth nodetach" 1.23 $ppp ${2:-$n.1:$n.2} passive pty "$ssh $1 $ppp ${3:-proxyarp} notty" \
2.1 --- a/tazinst/receipt Sat May 02 05:27:45 2015 +0300 2.2 +++ b/tazinst/receipt Sat May 02 12:05:22 2015 +0200 2.3 @@ -13,6 +13,7 @@ 2.4 TAGS="slitaz" 2.5 2.6 DEPENDS="util-linux-blkid lzma parted" 2.7 +SUGGESTED="tazpanel" 2.8 2.9 # Rules to configure and make the package. 2.10 compile_rules()