summaryrefslogtreecommitdiff
Unidiff
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
@@ -46,31 +46,37 @@ case $1 in
46 "3800" ) export QWS_DISPLAY=Transformed:Rot90:0 ;; 46 "3800" ) export QWS_DISPLAY=Transformed:Rot90:0 ;;
47 *) echo "Unknown processor type -`module_id`-!" ;; 47 *) echo "Unknown processor type -`module_id`-!" ;;
48 esac 48 esac
49 else 49 else
50 export QWS_DISPLAY=Transformed:Rot270:0 50 export QWS_DISPLAY=Transformed:Rot270:0
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
72 ;; 78 ;;
73'stop') 79'stop')
74 echo "Killing Opie..." 80 echo "Killing Opie..."
75 if [ -f /var/run/opie.pid ]; then 81 if [ -f /var/run/opie.pid ]; then
76 kill -TERM `cat /var/run/opie.pid` 82 kill -TERM `cat /var/run/opie.pid`