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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-05-03 17:07:12 +0300 (Thu, 03 May 2007)
New Revision: 11417

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/debian/postinst
   projects/haf/trunk/osso-af-startup/services/af-defines.sh
Log:
added exporting of osso-product-info variables


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2007-05-03 13:42:30 UTC (rev 11416)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2007-05-03 14:07:12 UTC (rev 11417)
@@ -3,6 +3,8 @@
   * UNRELEASED
   * Added startup of a Rhapsody script in the first boot.
   * Added support for osso-backup-finish-restore.sh.
+  * Added exporting of osso-product-info variables for internal use.
+  * Removed sourcing of hildon-desktop.defs.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 03 May 2007 14:59:05 +0300
 

Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2007-05-03 13:42:30 UTC (rev 11416)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2007-05-03 14:07:12 UTC (rev 11417)
@@ -73,4 +73,6 @@
 add_sudoer 'user ALL = NOPASSWD: /etc/init.d/alarmd stop'
 add_sudoer 'user ALL = NOPASSWD: /etc/init.d/osso-hss start'
 add_sudoer 'user ALL = NOPASSWD: /etc/init.d/osso-hss stop'
+add_sudoer 'user ALL = NOPASSWD: /usr/bin/osso-product-info'
+add_sudoer 'user ALL = NOPASSWD: rm -f /tmp/.opi.tmp'
 

Modified: projects/haf/trunk/osso-af-startup/services/af-defines.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/af-defines.sh	2007-05-03 13:42:30 UTC (rev 11416)
+++ projects/haf/trunk/osso-af-startup/services/af-defines.sh	2007-05-03 14:07:12 UTC (rev 11417)
@@ -4,7 +4,7 @@
 #
 # This file is part of osso-af-startup.
 #
-# Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
+# Copyright (C) 2004-2007 Nokia Corporation. All rights reserved.
 #
 # Contact: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 #
@@ -115,9 +115,18 @@
 
   source_if_is osso-gtk.defs
   source_if_is matchbox.defs
-  source_if_is hildon-desktop.defs
   source_if_is keyboard.defs
 
+  if [ -x /usr/bin/osso-product-info ]; then
+    sudo /usr/bin/osso-product-info 1> /tmp/.opi.tmp
+    if [ -r /tmp/.opi.tmp ]; then
+      VNAMES=`awk -F '=' '{print $1}' < /tmp/.opi.tmp`
+      source /tmp/.opi.tmp
+      export $VNAMES
+    fi
+    sudo rm -f /tmp/.opi.tmp
+  fi
+
   export AF_DEFINES_SOURCED=1
 
 fi  ;# AF_DEFINES_SOURCED definition check