[maemo-commits] [maemo-commits] r15740 - projects/haf/trunk/maemo-launcher/debian

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2008-07-03 18:47:32 +0300 (Thu, 03 Jul 2008)
New Revision: 15740

Modified:
   projects/haf/trunk/maemo-launcher/debian/changelog
   projects/haf/trunk/maemo-launcher/debian/init.d
Log:
Add comment about the wrongness of the current approach

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/changelog	2008-07-03 15:47:28 UTC (rev 15739)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2008-07-03 15:47:32 UTC (rev 15740)
@@ -1,6 +1,8 @@
 maemo-launcher (0.30-2) UNRELEASED; urgency=low
 
   * Export USER, LOGNAME, SHELL and HOME to maemo-launcher. (Fixes: MM#1131)
+  * Add comment in the init.d script about the wrongess of the current
+    approach.
 
  -- Guillem Jover <guillem.jover at nokia.com>  Fri, 06 Jun 2008 20:23:48 +0300
 

Modified: projects/haf/trunk/maemo-launcher/debian/init.d
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/init.d	2008-07-03 15:47:28 UTC (rev 15739)
+++ projects/haf/trunk/maemo-launcher/debian/init.d	2008-07-03 15:47:32 UTC (rev 15740)
@@ -9,13 +9,12 @@
 DAEMON_BASE_OPTS="--daemon --send-app-died --booster gtk"
 PIDFILE=/tmp/$NAME.pid
 
-# OSSO AF Init definitions
-DEFSDIR=/etc/osso-af-init/
-
 # When inside scratchbox we are not really root nor do we have 'user' user
 if [ -f /targets/links/scratchbox.config ]; then
   DAEMON_OPTS="$DAEMON_BASE_OPTS"
 else
+  # FIXME: this is wrong wrong wrong, and should not be hardcoded, this script
+  #        belongs in the session level instead.
   PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
   export USER=user
   export LOGNAME=$USER
@@ -35,6 +34,12 @@
 set -e
 
 # Those files set needed environment variables for the Maemo applications
+# FIXME: but this should not be needed either, and should be inherited from
+#        the session instead.
+
+# OSSO AF Init definitions
+DEFSDIR=/etc/osso-af-init/
+
 if [ -e $DEFSDIR/af-defines.sh ]
 then
   . $DEFSDIR/af-defines.sh