[maemo-commits] [maemo-commits] r19235 - in projects/haf/tags/ke-recv/3.19-9: . debian

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-08-28 15:52:41 +0300 (Fri, 28 Aug 2009)
New Revision: 19235

Added:
   projects/haf/tags/ke-recv/3.19-9/usb_phonet_mode
Modified:
   projects/haf/tags/ke-recv/3.19-9/Makefile.am
   projects/haf/tags/ke-recv/3.19-9/debian/changelog
   projects/haf/tags/ke-recv/3.19-9/debian/init.d
Log:
add flag file usb_phonet_mode


Modified: projects/haf/tags/ke-recv/3.19-9/Makefile.am
===================================================================
--- projects/haf/tags/ke-recv/3.19-9/Makefile.am	2009-08-28 12:52:35 UTC (rev 19234)
+++ projects/haf/tags/ke-recv/3.19-9/Makefile.am	2009-08-28 12:52:41 UTC (rev 19235)
@@ -1 +1,4 @@
 SUBDIRS = src mmc-utils
+
+flagfiledir = /var/lib/ke-recv
+flagfile_DATA = usb_phonet_mode

Modified: projects/haf/tags/ke-recv/3.19-9/debian/changelog
===================================================================
--- projects/haf/tags/ke-recv/3.19-9/debian/changelog	2009-08-28 12:52:35 UTC (rev 19234)
+++ projects/haf/tags/ke-recv/3.19-9/debian/changelog	2009-08-28 12:52:41 UTC (rev 19235)
@@ -1,3 +1,10 @@
+ke-recv (3.19-9) unstable; urgency=low
+
+  * Add usb_phonet_mode flag file for fixing NB#134836.
+  * modprobe g_nokia if usb_phonet_mode exists.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 28 Aug 2009 15:23:53 +0300
+
 ke-recv (3.19-8) unstable; urgency=low
 
   * Do not require the external card to have a partition in order to format

Modified: projects/haf/tags/ke-recv/3.19-9/debian/init.d
===================================================================
--- projects/haf/tags/ke-recv/3.19-9/debian/init.d	2009-08-28 12:52:35 UTC (rev 19234)
+++ projects/haf/tags/ke-recv/3.19-9/debian/init.d	2009-08-28 12:52:41 UTC (rev 19235)
@@ -76,8 +76,14 @@
         fi
 
         if [ "x$TA_IMAGE" = "x" ]; then
-                # g_file_storage is loaded as the default
-                /sbin/modprobe g_file_storage stall=0 luns=2 removable
+                if [ -e /var/lib/ke-recv/usb_phonet_mode ]; then
+                        /sbin/modprobe g_nokia
+                        rm -f /var/lib/ke-recv/usb_phonet_mode
+                        sync
+                else
+                        # g_file_storage is loaded as the default
+                        /sbin/modprobe g_file_storage stall=0 luns=2 removable
+                fi
         fi
 
 	if [ -x $DTOOL ]; then

Added: projects/haf/tags/ke-recv/3.19-9/usb_phonet_mode
===================================================================