opie: don't wait 5 seconds before starting by default.

Signed-off-by: Rene Wagner <rw@handhelds.org>

diff --git a/org.handhelds.familiar/packages/opie-taskbar/opie-taskbar/opie b/org.handhelds.familiar/packages/opie-taskbar/opie-taskbar/opie
index 0d9452523ea4093606cf61f0baa385caa601e759..be8a1911219a86c651479c9bddb1f81b14fc9b78 100755 (executable)
--- a/org.handhelds.familiar/packages/opie-taskbar/opie-taskbar/opie
+++ b/org.handhelds.familiar/packages/opie-taskbar/opie-taskbar/opie
@@ -36,7 +36,9 @@ fi
 
 case $1 in
 'start')
-    /sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
+    if [ -e $OPIEDIR/etc/waitkey ]; then
+        /sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
+    fi
     
     if [ -x "$OPIEDIR/bin/opie-login" ]; then
             echo Starting Opie-login....

diff --git a/org.handhelds.familiar/packages/opie-taskbar/opie-taskbar_1.2.1.bb b/org.handhelds.familiar/packages/opie-taskbar/opie-taskbar_1.2.1.bb
index 7d0d83750458a2640cd4539b8f2b79d578d197f1..c1078d6b054b0c2b7f5ff3bb0d088b4cd2e43f98 100644 (file)
--- a/org.handhelds.familiar/packages/opie-taskbar/opie-taskbar_1.2.1.bb
+++ b/org.handhelds.familiar/packages/opie-taskbar/opie-taskbar_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
 
-PR = "r2"
+PR = "r3"
  
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \