summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-11-06 23:14:58 (UTC)
committer mickeyl <mickeyl>2003-11-06 23:14:58 (UTC)
commit6cd088957d27ce639bf5ee9e25a9e37b9ad7b976 (patch) (unidiff)
tree4ef9d0ecbcabdf7231c9bb3ab800b28f227d998c
parentf3546aa2a7a0fa8b1f8eb0c317ce9c7c7ab8eff3 (diff)
downloadopie-6cd088957d27ce639bf5ee9e25a9e37b9ad7b976.zip
opie-6cd088957d27ce639bf5ee9e25a9e37b9ad7b976.tar.gz
opie-6cd088957d27ce639bf5ee9e25a9e37b9ad7b976.tar.bz2
merge root/*
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xroot/etc/init.d/opie2
-rw-r--r--root/etc/ppp/peers/opie-kppp3
-rw-r--r--root/opt/QtPalmtop/etc/opie-login.conf2
3 files changed, 6 insertions, 1 deletions
diff --git a/root/etc/init.d/opie b/root/etc/init.d/opie
index 5f454bd..d49498c 100755
--- a/root/etc/init.d/opie
+++ b/root/etc/init.d/opie
@@ -1,96 +1,96 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3 3
4[ -z $LOGNAME ] && export LOGNAME=root 4[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/root
5[ -z $HOME ] && export HOME=/$LOGNAME 5[ -z $HOME ] && export HOME=/$LOGNAME
6 6
7export QTDIR=/opt/QtPalmtop 7export QTDIR=/opt/QtPalmtop
8export OPIEDIR=/opt/QtPalmtop 8export OPIEDIR=/opt/QtPalmtop
9export QPEDIR=/opt/QtPalmtop 9export QPEDIR=/opt/QtPalmtop
10export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib 10export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
11export PATH=$PATH:$OPIEDIR/bin 11export PATH=$PATH:$OPIEDIR/bin
12 12
13if [ -e /proc/hal/model ] ; then 13if [ -e /proc/hal/model ] ; then
14 ipaq=`cat /proc/hal/model` 14 ipaq=`cat /proc/hal/model`
15 15
16 case "$ipaq" in 16 case "$ipaq" in
17 "3100" ) export QWS_DISPLAY=Transformed:Rot90:0 ;; 17 "3100" ) export QWS_DISPLAY=Transformed:Rot90:0 ;;
18 "3600" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; 18 "3600" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
19 "3700" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; 19 "3700" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
20 "3800" ) export QWS_DISPLAY=Transformed:Rot90:0 ;; 20 "3800" ) export QWS_DISPLAY=Transformed:Rot90:0 ;;
21 "3900" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; 21 "3900" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
22 "5400" ) export QWS_DISPLAY=Transformed:Rot0:0 ;; 22 "5400" ) export QWS_DISPLAY=Transformed:Rot0:0 ;;
23 *) echo "Unknown iPAQ model: $ipaq" ;; 23 *) echo "Unknown iPAQ model: $ipaq" ;;
24 esac 24 esac
25else 25else
26 export QWS_DISPLAY=Transformed:Rot270:0 26 export QWS_DISPLAY=Transformed:Rot270:0
27fi 27fi
28 28
29if [ -e /proc/cpuinfo ] ; then 29if [ -e /proc/cpuinfo ] ; then
30 if (grep -qi "Simpad" /proc/cpuinfo) ; then 30 if (grep -qi "Simpad" /proc/cpuinfo) ; then
31 export QWS_KEYBOARD='SIMpad' 31 export QWS_KEYBOARD='SIMpad'
32 export QWS_DISPLAY=Transformed:Rot0:0 32 export QWS_DISPLAY=Transformed:Rot0:0
33 fi 33 fi
34 if (grep -qi "HP Jornada 56x" /proc/cpuinfo) ; then 34 if (grep -qi "HP Jornada 56x" /proc/cpuinfo) ; then
35 export QWS_DISPLAY=Transformed:Rot0:0 35 export QWS_DISPLAY=Transformed:Rot0:0
36 fi 36 fi
37fi 37fi
38 38
39 39
40if [ ! -x $OPIEDIR/bin/qpe ] ; then 40if [ ! -x $OPIEDIR/bin/qpe ] ; then
41 echo Opie not installed 41 echo Opie not installed
42 exit 0 42 exit 0
43fi 43fi
44 44
45. /etc/profile 45. /etc/profile
46 46
47case $1 in 47case $1 in
48'start') 48'start')
49 cd $HOME 49 cd $HOME
50 rm -f /etc/rc2.d/S99x # Can't have both running! 50 rm -f /etc/rc2.d/S99x # Can't have both running!
51 51
52 if [ -x $OPIEDIR/bin/opie-login ]; then 52 if [ -x $OPIEDIR/bin/opie-login ]; then
53 if ! killall -0 syslogd 2>/dev/null >/dev/null; then 53 if ! killall -0 syslogd 2>/dev/null >/dev/null; then
54 echo Starting Opie-login.... 54 echo Starting Opie-login....
55 $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null & 55 $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null &
56 else 56 else
57 echo Starting Opie-login with syslog logging..... 57 echo Starting Opie-login with syslog logging.....
58 ( $OPIEDIR/bin/opie-login 2>&1 | logger ) & 58 ( $OPIEDIR/bin/opie-login 2>&1 | logger ) &
59 fi 59 fi
60 else 60 else
61 $OPIEDIR/bin/opie-reorgfiles 61 $OPIEDIR/bin/opie-reorgfiles
62 if [ -x /usr/bin/ssh-agent ]; then 62 if [ -x /usr/bin/ssh-agent ]; then
63 SSHAGENT=/usr/bin/ssh-agent 63 SSHAGENT=/usr/bin/ssh-agent
64 else 64 else
65 SSHAGENT="" 65 SSHAGENT=""
66 fi 66 fi
67 67
68 if [ -x $OPIEDIR/bin/opie-sh-ssh-askpass.sh ]; then 68 if [ -x $OPIEDIR/bin/opie-sh-ssh-askpass.sh ]; then
69 export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh 69 export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
70 fi 70 fi
71 71
72 if ! killall -0 syslogd 2>/dev/null >/dev/null; then 72 if ! killall -0 syslogd 2>/dev/null >/dev/null; then
73 echo Starting Opie.... 73 echo Starting Opie....
74 $SSHAGENT $OPIEDIR/bin/qpe 2>/dev/null >/dev/null & 74 $SSHAGENT $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
75 else 75 else
76 echo Starting Opie with syslog logging..... 76 echo Starting Opie with syslog logging.....
77 ( $SSHAGENT $OPIEDIR/bin/qpe 2>&1 | logger ) & 77 ( $SSHAGENT $OPIEDIR/bin/qpe 2>&1 | logger ) &
78 fi 78 fi
79 fi 79 fi
80 80
81 ;; 81 ;;
82 82
83'stop') 83'stop')
84 echo "Killing Opie..." 84 echo "Killing Opie..."
85 killall qpe 85 killall qpe
86 killall opie-login 86 killall opie-login
87 87
88 ;; 88 ;;
89 89
90*) 90*)
91 echo "usage: $0 { start | stop }" 91 echo "usage: $0 { start | stop }"
92 92
93 ;; 93 ;;
94 94
95esac 95esac
96 96
diff --git a/root/etc/ppp/peers/opie-kppp b/root/etc/ppp/peers/opie-kppp
new file mode 100644
index 0000000..2b349d9
--- a/dev/null
+++ b/root/etc/ppp/peers/opie-kppp
@@ -0,0 +1,3 @@
1noauth
2name opie-kppp
3usepeerdns
diff --git a/root/opt/QtPalmtop/etc/opie-login.conf b/root/opt/QtPalmtop/etc/opie-login.conf
new file mode 100644
index 0000000..13195b1
--- a/dev/null
+++ b/root/opt/QtPalmtop/etc/opie-login.conf
@@ -0,0 +1,2 @@
1[General]
2AutoLogin = root