Merge lp:~lool/ubuntu/saucy/lxc-android-config/set-display-mir into lp:ubuntu/saucy/lxc-android-config

[Loïc Minier]

Add set-display-mir boot-hook to create .display-mir file on boot, unless the hook already ran; switches the default to Mir for users of SF on system-upgrades; this should only run once on upgrades, but the current boot-hooks don't allow this with a dep on other jobs.

[Loïc Minier (lool)]

Tested by booting without .display-mir, it got added along .set-display-mir-done and Mir was used.

Then removing .display-mir + rebooting, and SF came up.

[Sergio Schvezov (sergiusens)]

XXX not sure if this is a placeholder for a bug or something

review: Approve

[Loïc Minier (lool)]

XXX is indeed for a boot-hooks bug that we can't listen for "new-version", only for "every-boot" which is suboptimal, but works.

[lp:~lool/ubuntu/saucy/lxc-android-config/set-display-mir]

111. By Loïc Minier on 2013-10-09

Only touch .display-mir on supported devices: grouper, maguro, mako.

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-04 16:56:28 +0000
+++ debian/changelog	2013-10-09 00:18:09 +0000
@@ -1,3 +1,13 @@
+lxc-android-config (0.110) saucy; urgency=low
+
+  * Add set-display-mir boot-hook to create .display-mir file on boot (on
+    supported devices), unless the hook already ran; switches the default to
+    Mir for users of SF on system-upgrades; this should only run once on
+    upgrades, but the current boot-hooks don't allow this with a dep on other
+    jobs.
+
+ -- Loïc Minier <[e-mail]>  Tue, 08 Oct 2013 23:16:18 +0200
+
 lxc-android-config (0.109) saucy; urgency=low
 
   * rework teh former change slightly so prerequisites for the job are

=== added file 'etc/init/boot-hooks/set-display-mir.conf'
--- etc/init/boot-hooks/set-display-mir.conf	1970-01-01 00:00:00 +0000
+++ etc/init/boot-hooks/set-display-mir.conf	2013-10-09 00:18:09 +0000
@@ -0,0 +1,36 @@
+# set-display-mir - creates .display-mir file once (on supported devices)
+
+author "Loïc Minier <[e-mail]>"
+description "Creates .display-mir file once"
+
+# start when first boot-hooks event is emitted and before lxc-android-config
+# starts as it disables SurfaceFlinger based on the Mir flag
+start on boot-hooks and starting lxc-android-config
+
+# NOT a task as otherwise this would block restarting lxc-android-config
+
+setuid phablet
+setgid phablet
+chdir /home/phablet
+env FLAG=.set-display-mir-done
+env DISPLAY_MIR=.display-mir
+
+# work needs to be done in pre-start as this really is a job with nothing to
+# start
+pre-start script
+    # XXX this is what we should be using, but this job gets started with
+    # "WHEN=every-boot" and then doesn't get the second event for
+    # "WHEN=new-version"
+    #if [ "$WHEN" = "new-version" ] && [ ! -e "$FLAG" ]; then
+    if [ ! -e "$FLAG" ]; then
+        # only enable on supported devices
+        case "$(getprop ro.product.model)" in
+          grouper|maguro|mako)
+            touch "$DISPLAY_MIR"
+          ;;
+        esac
+
+        touch "$FLAG"
+    fi
+end script
+