improved version by obri

1 files changed, 27 insertions, 8 deletions

diff --git a/root/etc/init.d/opie b/root/etc/init.d/opie
index 09aebe0..01704f2 100755
--- a/root/etc/init.d/opie
+++ b/root/etc/init.d/opie
@@ -1,67 +1,86 @@
 #!/bin/sh
 # 
 
-module_id() {
-   cat /proc/hal/model
-}
-
 export LOGNAME=root
 export HOME=/$LOGNAME
 #export QWS_DISPLAY=Transformed:Rot270:0
 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
 
 #this sets the iPaqs powerbutton to mapable
+if [ -e /proc/sys/ts/suspend_button_mode ] ; then
 echo 1 > /proc/sys/ts/suspend_button_mode
+fi
 
-if [ ! -x $OPIEDIR/bin/qpe ] ; then exit 0 ; fi
+if [ ! -x $OPIEDIR/bin/qpe ] ; then 
+    echo Opie not installed
+    exit 0  
+fi
 
 $OPIEDIR/bin/opie-reorgfiles
 
 . /etc/profile
 
 killproc() {
         pid=`/bin/ps -e | /bin/sed -n -e '/\<'$1'\>/ s/^ *\([0-9][0-9]*\).*/\1/p'`
         [ "$pid" != "" ] && kill $pid
 }
 
 case $1 in
 'start')
-	echo "Starting Opie..."
 
 	cd $HOME
-
 	rm -f /etc/rc2.d/S99x # Can't have both running!
 
-	 case `module_id` in 
+	if [ -e /proc/hal/model ] ; then
+
+	    IPAQ=`cat /proc/hal/model`
+	
+	    echo iPAQ type $IPAQ  
+	    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 ;;
         *) echo "Unknown processor type -`module_id`-!" ;;
    	 esac
+	 fi
+
 	
 	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
+	    if ! killall -0 syslogd 2>/dev/null >/dev/null; then
+    		echo Starting Opie....
 		$OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
+	    else
+		echo Starting Opie with syslog logging.....
+		($OPIEDIR/bin/qpe 2>&1 | logger ) &
+	    fi
 	fi
 
 	;;
 'stop')
         echo "Killing Opie..."
         if [ -f /var/run/opie.pid ]; then
         	kill -TERM `cat /var/run/opie.pid`
         else
         	killproc qpe
         fi
+
         killproc opie-login
         ;;
 *)
         echo "usage: $0 { start | stop }"
         ;;
 esac