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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-05-03 17:22:44 +0300 (Thu, 03 May 2007)
New Revision: 11420

Modified:
   projects/haf/trunk/osso-af-startup/debian/postinst
   projects/haf/trunk/osso-af-startup/services/af-defines.sh
Log:
some bug fixes


Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2007-05-03 14:21:23 UTC (rev 11419)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2007-05-03 14:22:44 UTC (rev 11420)
@@ -74,5 +74,5 @@
 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'
+add_sudoer 'user ALL = NOPASSWD: /bin/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 14:21:23 UTC (rev 11419)
+++ projects/haf/trunk/osso-af-startup/services/af-defines.sh	2007-05-03 14:22:44 UTC (rev 11420)
@@ -118,11 +118,12 @@
   source_if_is keyboard.defs
 
   if [ -x /usr/bin/osso-product-info ]; then
-    sudo /usr/bin/osso-product-info 1> /tmp/.opi.tmp
+    sudo /usr/bin/osso-product-info 1> /tmp/.opi.tmp 2> /dev/null
     if [ -r /tmp/.opi.tmp ]; then
       VNAMES=`awk -F '=' '{print $1}' < /tmp/.opi.tmp`
       source /tmp/.opi.tmp
       export $VNAMES
+      unset VNAMES
     fi
     sudo rm -f /tmp/.opi.tmp
   fi