summaryrefslogtreecommitdiff
authorzecke <zecke>2002-09-19 18:48:12 (UTC)
committer zecke <zecke>2002-09-19 18:48:12 (UTC)
commit04fd73b51c766027f2168ed8220f7cbb7ca1486c (patch) (side-by-side diff)
treef144859ed2ccf02194e506bcbccf7bce50ffef4c
parentf034f7d2269058ca43c2eb8af8bb8e793e1b1850 (diff)
downloadopie-04fd73b51c766027f2168ed8220f7cbb7ca1486c.zip
opie-04fd73b51c766027f2168ed8220f7cbb7ca1486c.tar.gz
opie-04fd73b51c766027f2168ed8220f7cbb7ca1486c.tar.bz2
Patch by dwwm2 to add opie-sh-ssh-askpass to opie init script
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xroot/etc/init.d/opie4
1 files changed, 4 insertions, 0 deletions
diff --git a/root/etc/init.d/opie b/root/etc/init.d/opie
index 75f4f7b..b5afe86 100755
--- a/root/etc/init.d/opie
+++ b/root/etc/init.d/opie
@@ -28,64 +28,68 @@ killproc() {
[ "$pid" != "" ] && kill $pid
}
case $1 in
'start')
cd $HOME
rm -f /etc/rc2.d/S99x # Can't have both running!
if [ -e /proc/hal/model ] ; then
IPAQ=`cat /proc/hal/model`
echo iPAQ type $IPAQ
case $IPAQ in
"3100" ) export QWS_DISPLAY=Transformed:Rot90:0 ;;
"3600" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
"3700" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
"3800" ) export QWS_DISPLAY=Transformed:Rot90:0 ;;
*) echo "Unknown processor type -`module_id`-!" ;;
esac
else
export QWS_DISPLAY=Transformed:Rot270:0
fi
if [ -x /usr/bin/ssh-agent ]; then
SSHAGENT=/usr/bin/ssh-agent
else
SSHAGENT=""
fi
+ if [ -x $OPIEDIR/bin/opie-sh-ssh-askpass.sh ]; then
+ export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
+ fi
+
if [ -x $OPIEDIR/bin/opie-login ]; then
if ! killall -0 syslogd 2>/dev/null >/dev/null; then
echo Starting Opie-login....
$SSHAGENT $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null &
else
echo Starting Opie-login with syslog logging.....
($SSHAGENT $OPIEDIR/bin/opie-login 2>&1 | logger ) &
fi
else
if ! killall -0 syslogd 2>/dev/null >/dev/null; then
echo Starting Opie....
$SSHAGENT $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
else
echo Starting Opie with syslog logging.....
($SSHAGENT $OPIEDIR/bin/qpe 2>&1 | logger ) &
fi
fi
;;
'stop')
echo "Killing Opie..."
if [ -f /var/run/opie.pid ]; then
kill -TERM `cat /var/run/opie.pid`
else
killproc qpe
fi
killproc opie-login
;;
*)
echo "usage: $0 { start | stop }"
;;