Merge lp:~ondrak/lxc-android-config/fix_1551150 into lp:lxc-android-config

[Ondrej Kubik]

Updating lxc-android-config to work with new lxc v2.0. This fixes boot of devel-proposed (Xenial) channel (LP: #1551150)

Updating lxc-android-config to work with new lxc v2.0

This fixes boot of devel-proposed (Xenial) channel

bug: https://bugs.launchpad.net/bugs/1551150

[Łukasz Zemczak (sil2100)]

+1

review: Approve

=== modified file 'debian/lxc-android-config.upstart'
--- debian/lxc-android-config.upstart	2015-09-02 07:50:44 +0000
+++ debian/lxc-android-config.upstart	2016-06-16 12:56:07 +0000
@@ -2,21 +2,23 @@
 #
 # Configure and initialize the Android container for Ubuntu Touch
 
-description	"lxc android config and container initialization"
+description "lxc android config and container initialization"
 
-start on cgmanager-ready
+start on cgmanager-ready and started cgroup-lite
 stop on runlevel [06]
 
-emits android
-
-console none
-
-exec lxc-start -n android -F -- /init
+pre-start script
+    if [ ! -d /sys/fs/cgroup/systemd ]; then
+        mkdir -p /sys/fs/cgroup/systemd
+        mount -t cgroup cgroup /sys/fs/cgroup/systemd -o name=systemd
+    fi
+end script
+
+exec lxc-start -n android -d -- /init
 
 post-start script
     if [ ! -d /dev/cpuctl ] && [ -d /sys/fs/cgroup/cpu ]; then
-        mkdir /dev/cpuctl
-        mount -t cgroup -o cpu none /sys/fs/cgroup/cpu
+        ln -s /sys/fs/cgroup/cpu /dev/cpuctl
     fi
 
     lxc-wait -n android -s RUNNING -t 30
@@ -35,6 +37,13 @@
             done
         fi
 
+        # Hide all the cgroups again
+        stop cgroup-lite
+        if [ -d /sys/fs/cgroup/systemd ]; then
+            umount /sys/fs/cgroup/systemd
+            rmdir /sys/fs/cgroup/systemd
+        fi
+
         initctl emit android
     else
         stop; exit 1