[maemo-commits] [maemo-commits] r16627 - in projects/haf/trunk/osso-af-startup: debian services

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-11-12 13:10:05 +0200 (Wed, 12 Nov 2008)
New Revision: 16627

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/real-af-startup
Log:
Do not unconditionally source /etc/osso-af-init/keyboard.sh

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-11-11 14:42:17 UTC (rev 16626)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-11-12 11:10:05 UTC (rev 16627)
@@ -2,6 +2,7 @@
 
   * Added init script to save clock state to hw: top-scripts/hwclock
   * Moving creation/destruction of /tmp/first-boot-flag-tmp to real-af-startup
+  * Don't unconditionally source /etc/osso-af-init/keyboard.sh
   * Fixes: NB#90795
 
  -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed,  8 Oct 2008 14:22:55 +0300

Modified: projects/haf/trunk/osso-af-startup/services/real-af-startup
===================================================================
--- projects/haf/trunk/osso-af-startup/services/real-af-startup	2008-11-11 14:42:17 UTC (rev 16626)
+++ projects/haf/trunk/osso-af-startup/services/real-af-startup	2008-11-12 11:10:05 UTC (rev 16627)
@@ -75,7 +75,9 @@
     source $AF_INIT_DIR/keyboard.defs
   fi
 
-  source $AF_INIT_DIR/keyboard.sh start
+  if [ -f $AF_INIT_DIR/keyboard.sh ]; then
+    source $AF_INIT_DIR/keyboard.sh start
+  fi
 
   # start clipboard daemon 
   if [ -f $AF_INIT_DIR/clipboard.sh ]; then