summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-09-17 16:25:38 (UTC)
committer harlekin <harlekin>2002-09-17 16:25:38 (UTC)
commitd8a05881b58a51ee2bd3b6198cf0d0c0b3f3b56c (patch) (side-by-side diff)
treec6ae47c02275ebaef6d930253598bd45ed45375b
parent62b5cd2ee8eb65d11467ce7469505788ef2280d5 (diff)
downloadopie-d8a05881b58a51ee2bd3b6198cf0d0c0b3f3b56c.zip
opie-d8a05881b58a51ee2bd3b6198cf0d0c0b3f3b56c.tar.gz
opie-d8a05881b58a51ee2bd3b6198cf0d0c0b3f3b56c.tar.bz2
now use ssh-agent if it is present
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xroot/etc/init.d/opie14
1 files changed, 10 insertions, 4 deletions
diff --git a/root/etc/init.d/opie b/root/etc/init.d/opie
index ada0431..75f4f7b 100755
--- a/root/etc/init.d/opie
+++ b/root/etc/init.d/opie
@@ -42,39 +42,45 @@ case $1 in
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-login ]; then
if ! killall -0 syslogd 2>/dev/null >/dev/null; then
echo Starting Opie-login....
- $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null &
+ $SSHAGENT $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null &
else
echo Starting Opie-login with syslog logging.....
- ($OPIEDIR/bin/opie-login 2>&1 | logger ) &
+ ($SSHAGENT $OPIEDIR/bin/opie-login 2>&1 | logger ) &
fi
else
if ! killall -0 syslogd 2>/dev/null >/dev/null; then
echo Starting Opie....
- $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
+ $SSHAGENT $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
else
echo Starting Opie with syslog logging.....
- ($OPIEDIR/bin/qpe 2>&1 | logger ) &
+ ($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