summaryrefslogtreecommitdiff
authorzecke <zecke>2002-09-19 18:48:12 (UTC)
committer zecke <zecke>2002-09-19 18:48:12 (UTC)
commit04fd73b51c766027f2168ed8220f7cbb7ca1486c (patch) (unidiff)
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
@@ -44,32 +44,36 @@ case $1 in
44 "3600" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; 44 "3600" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
45 "3700" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; 45 "3700" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
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 54 if [ -x /usr/bin/ssh-agent ]; then
55 SSHAGENT=/usr/bin/ssh-agent 55 SSHAGENT=/usr/bin/ssh-agent
56 else 56 else
57 SSHAGENT="" 57 SSHAGENT=""
58 fi 58 fi
59 59
60 if [ -x $OPIEDIR/bin/opie-sh-ssh-askpass.sh ]; then
61 export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
62 fi
63
60 if [ -x $OPIEDIR/bin/opie-login ]; then 64 if [ -x $OPIEDIR/bin/opie-login ]; then
61 if ! killall -0 syslogd 2>/dev/null >/dev/null; then 65 if ! killall -0 syslogd 2>/dev/null >/dev/null; then
62 echo Starting Opie-login.... 66 echo Starting Opie-login....
63 $SSHAGENT $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null & 67 $SSHAGENT $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null &
64 else 68 else
65 echo Starting Opie-login with syslog logging..... 69 echo Starting Opie-login with syslog logging.....
66 ($SSHAGENT $OPIEDIR/bin/opie-login 2>&1 | logger ) & 70 ($SSHAGENT $OPIEDIR/bin/opie-login 2>&1 | logger ) &
67 fi 71 fi
68 else 72 else
69 if ! killall -0 syslogd 2>/dev/null >/dev/null; then 73 if ! killall -0 syslogd 2>/dev/null >/dev/null; then
70 echo Starting Opie.... 74 echo Starting Opie....
71 $SSHAGENT $OPIEDIR/bin/qpe 2>/dev/null >/dev/null & 75 $SSHAGENT $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
72 else 76 else
73 echo Starting Opie with syslog logging..... 77 echo Starting Opie with syslog logging.....
74 ($SSHAGENT $OPIEDIR/bin/qpe 2>&1 | logger ) & 78 ($SSHAGENT $OPIEDIR/bin/qpe 2>&1 | logger ) &
75 fi 79 fi