summaryrefslogtreecommitdiff
authorzecke <zecke>2004-05-01 18:27:04 (UTC)
committer zecke <zecke>2004-05-01 18:27:04 (UTC)
commit0d4fd8b708eddb609fd3b14ffe7df1cb3a1401f1 (patch) (side-by-side diff)
tree793382538897161a55dc542da7a0fae0e8f937c8
parent7a2cac7a65be07c1e82508e00c2d3d61e0823dc1 (diff)
downloadopie-0d4fd8b708eddb609fd3b14ffe7df1cb3a1401f1.zip
opie-0d4fd8b708eddb609fd3b14ffe7df1cb3a1401f1.tar.gz
opie-0d4fd8b708eddb609fd3b14ffe7df1cb3a1401f1.tar.bz2
patch by Michael O. to only use cpuinfo
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xroot/etc/init.d/opie36
1 files changed, 14 insertions, 22 deletions
diff --git a/root/etc/init.d/opie b/root/etc/init.d/opie
index d49498c..df68090 100755
--- a/root/etc/init.d/opie
+++ b/root/etc/init.d/opie
@@ -1,63 +1,55 @@
#!/bin/sh
#
[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/root
[ -z $HOME ] && export HOME=/$LOGNAME
export QTDIR=/opt/QtPalmtop
export OPIEDIR=/opt/QtPalmtop
export QPEDIR=/opt/QtPalmtop
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
export PATH=$PATH:$OPIEDIR/bin
-if [ -e /proc/hal/model ] ; then
- ipaq=`cat /proc/hal/model`
-
- 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 ;;
- "3900" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
- "5400" ) export QWS_DISPLAY=Transformed:Rot0:0 ;;
- *) echo "Unknown iPAQ model: $ipaq" ;;
+if [ -e /proc/cpuinfo ] ; then
+ model=`grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z`
+
+ case "$model" in
+ "HP IPAQ H3100" | "HP IPAQ H3800" )
+ export QWS_DISPLAY=Transformed:Rot90:0 ;;
+ "HP IPAQ H5400" | "HP JORNADA 56X" | "HP IPAQ H2200" )
+ export QWS_DISPLAY=Transformed:Rot0:0 ;;
+ *SIMPAD* )
+ export QWS_KEYBOARD='SIMpad'
+ export QWS_DISPLAY=Transformed:Rot0:0 ;;
+
+ *)
+ export QWS_DISPLAY=Transformed:Rot270:0 ;;
esac
else
export QWS_DISPLAY=Transformed:Rot270:0
fi
-if [ -e /proc/cpuinfo ] ; then
- if (grep -qi "Simpad" /proc/cpuinfo) ; then
- export QWS_KEYBOARD='SIMpad'
- export QWS_DISPLAY=Transformed:Rot0:0
- fi
- if (grep -qi "HP Jornada 56x" /proc/cpuinfo) ; then
- export QWS_DISPLAY=Transformed:Rot0:0
- fi
-fi
-
-
if [ ! -x $OPIEDIR/bin/qpe ] ; then
echo Opie not installed
exit 0
fi
. /etc/profile
case $1 in
'start')
cd $HOME
rm -f /etc/rc2.d/S99x # Can't have both running!
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 &
else
echo Starting Opie-login with syslog logging.....
( $OPIEDIR/bin/opie-login 2>&1 | logger ) &
fi
else
$OPIEDIR/bin/opie-reorgfiles
if [ -x /usr/bin/ssh-agent ]; then
SSHAGENT=/usr/bin/ssh-agent