summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-09-17 16:25:38 (UTC)
committer harlekin <harlekin>2002-09-17 16:25:38 (UTC)
commitd8a05881b58a51ee2bd3b6198cf0d0c0b3f3b56c (patch) (unidiff)
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
@@ -51,21 +51,27 @@ case $1 in
51 fi 51 fi
52 52
53 53
54 if [ -x /usr/bin/ssh-agent ]; then
55 SSHAGENT=/usr/bin/ssh-agent
56 else
57 SSHAGENT=""
58 fi
59
54 if [ -x $OPIEDIR/bin/opie-login ]; then 60 if [ -x $OPIEDIR/bin/opie-login ]; then
55 if ! killall -0 syslogd 2>/dev/null >/dev/null; then 61 if ! killall -0 syslogd 2>/dev/null >/dev/null; then
56 echo Starting Opie-login.... 62 echo Starting Opie-login....
57 $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null & 63 $SSHAGENT $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null &
58 else 64 else
59 echo Starting Opie-login with syslog logging..... 65 echo Starting Opie-login with syslog logging.....
60 ($OPIEDIR/bin/opie-login 2>&1 | logger ) & 66 ($SSHAGENT $OPIEDIR/bin/opie-login 2>&1 | logger ) &
61 fi 67 fi
62 else 68 else
63 if ! killall -0 syslogd 2>/dev/null >/dev/null; then 69 if ! killall -0 syslogd 2>/dev/null >/dev/null; then
64 echo Starting Opie.... 70 echo Starting Opie....
65 $OPIEDIR/bin/qpe 2>/dev/null >/dev/null & 71 $SSHAGENT $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
66 else 72 else
67 echo Starting Opie with syslog logging..... 73 echo Starting Opie with syslog logging.....
68 ($OPIEDIR/bin/qpe 2>&1 | logger ) & 74 ($SSHAGENT $OPIEDIR/bin/qpe 2>&1 | logger ) &
69 fi 75 fi
70 fi 76 fi
71 77