# HG changeset patch # User Pascal Bellard # Date 1430561122 -7200 # Node ID 58f4bd56c8de85b855124ea8e2c098c5696e8d2c # Parent f8eb4005f878577f8e0f55223d2273a9e570757c dropbear: pppssh may use ssh keys diff -r f8eb4005f878 -r 58f4bd56c8de dropbear/stuff/sshx --- a/dropbear/stuff/sshx Sat May 02 05:27:45 2015 +0300 +++ b/dropbear/stuff/sshx Sat May 02 12:05:22 2015 +0200 @@ -24,14 +24,16 @@ pppssh() { - [ -z "$DROPBEAR_PASSWORD" ] && echo -n "ssh password: " && - read -s -t 30 DROPBEAR_PASSWORD && export DROPBEAR_PASSWORD + ssh="dbclient -y" + $ssh $1 true || { + [ -z "$DROPBEAR_PASSWORD" ] && echo -n "ssh password: " && + read -s -t 30 DROPBEAR_PASSWORD && export DROPBEAR_PASSWORD + $ssh $1 true || exit 1 + } for i in $4 ; do echo "route add -net $i dev \$1" done > /etc/ppp/ip-up.d/pppssh$$ chmod +x /etc/ppp/ip-up.d/pppssh$$ - ssh="dbclient -y" - $ssh $1 true || exit 1 n=10.$(($$%256)).$(($$/256)) ppp="/usr/sbin/pppd local noauth nodetach" $ppp ${2:-$n.1:$n.2} passive pty "$ssh $1 $ppp ${3:-proxyarp} notty" \ diff -r f8eb4005f878 -r 58f4bd56c8de tazinst/receipt --- a/tazinst/receipt Sat May 02 05:27:45 2015 +0300 +++ b/tazinst/receipt Sat May 02 12:05:22 2015 +0200 @@ -13,6 +13,7 @@ TAGS="slitaz" DEPENDS="util-linux-blkid lzma parted" +SUGGESTED="tazpanel" # Rules to configure and make the package. compile_rules() diff -r f8eb4005f878 -r 58f4bd56c8de tazlito/receipt --- a/tazlito/receipt Sat May 02 05:27:45 2015 +0300 +++ b/tazlito/receipt Sat May 02 12:05:22 2015 +0200 @@ -13,6 +13,7 @@ TAGS="slitaz" DEPENDS="lzma cdrkit" +SUGGESTED="tazpanel" BUILD_DEPENDS="gettext" # Rules to configure and make the package. diff -r f8eb4005f878 -r 58f4bd56c8de tazpkg/receipt --- a/tazpkg/receipt Sat May 02 05:27:45 2015 +0300 +++ b/tazpkg/receipt Sat May 02 12:05:22 2015 +0200 @@ -13,6 +13,7 @@ HOST_ARCH="i486 arm" DEPENDS="busybox gettext-base" +SUGGESTED="tazpanel" BUILD_DEPENDS="gettext" # Gettext is part of cross-chroot