too bad... there is lots of hardcoded stuff and compatibility cruft which

calls for "qpe". Let's postpone this for Opie 2.0 then.

1 files changed, 4 insertions, 4 deletions

diff --git a/root/etc/init.d/opie b/root/etc/init.d/opie
index a723864..d49498c 100755
--- a/root/etc/init.d/opie
+++ b/root/etc/init.d/opie
@@ -8,89 +8,89 @@ 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" ;;
     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/opie ] ; then 
+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
         else
              SSHAGENT=""
         fi
         
         if [ -x $OPIEDIR/bin/opie-sh-ssh-askpass.sh ]; then
             export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
         fi
             
         if ! killall -0 syslogd 2>/dev/null >/dev/null; then
             echo Starting Opie....
-            $SSHAGENT $OPIEDIR/bin/opie 2>/dev/null >/dev/null &
+            $SSHAGENT $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
         else
             echo Starting Opie with syslog logging.....
-            ( $SSHAGENT $OPIEDIR/bin/opie 2>&1 | logger ) &
+            ( $SSHAGENT $OPIEDIR/bin/qpe 2>&1 | logger ) &
         fi
     fi
 
     ;;
 
 'stop')
     echo "Killing Opie..."
-    killall opie
+    killall qpe
     killall opie-login
 
     ;;
 
 *)
     echo "usage: $0 { start | stop }"
 
     ;;
 
 esac