Merge lp:~awe/ubuntu/saucy/lxc-android-config/ofono-fixed-plugins into lp:ubuntu/saucy/lxc-android-config

[Tony Espy]

This change configured a fixed set of plugins for ofono on start-up, causing all other builtin plugins to be ignored.

On touch devices, ofono will always start, however if a device is not running an instance of rild, ofono will exit multiple times until the upstart script gives up.

Note, this merge needs to land in the same build as:

lp:~awe/ubuntu/saucy/ofono/rilmodem-support

This has been tested on a maguro running today's image ( 20130807 ).

[Oliver Grawert (ogra)]

looks fine

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-04 12:24:23 +0000
+++ debian/changelog	2013-08-08 00:32:34 +0000
@@ -1,3 +1,11 @@
+lxc-android-config (0.68) UNRELEASED; urgency=low
+
+  * ofono: start with a pre-defined set of plugins;
+    This is a result of the rilmodem code finally
+    landing in the archive version of ofono.
+
+ -- Tony Espy <[e-mail]>  Wed, 07 Aug 2013 20:25:14 -0400
+
 lxc-android-config (0.67) saucy; urgency=low
 
   * allow devices that use EFS as label for the factory partition to mount it

=== modified file 'etc/init/ofono.override'
--- etc/init/ofono.override	2013-07-01 18:08:17 +0000
+++ etc/init/ofono.override	2013-08-08 00:32:34 +0000
@@ -22,4 +22,4 @@
   sleep 5
 end script
 
-exec ofonod --noplugin=atmodem
+exec ofonod -p ril,rilmodem,provision,mbpi,nettime