Merge lp:~vicamo/lxc-android-config/lxd-migration into lp:lxc-android-config

[You-Sheng Yang]

[LP: 1641549]
* Add writable path for lxd.
* Migrate android container to lxd.
* Depend on lxd, lxd-client.
* Let urfkill wait for android container startup to retrieve wifi specific properties correctly.

Unmerged revisions

37. By You-Sheng Yang on 2016-11-17

Let urfkill wait for android container startup to retrieve wifi specific properties correctly. (LP: 1641549)

36. By You-Sheng Yang on 2016-11-17

Depend on lxd, lxd-client. (LP: 1641549)

35. By You-Sheng Yang on 2016-11-17

Migrate android container to lxd. (LP: 1641549)

34. By You-Sheng Yang on 2016-11-15

Add writable path for lxd. (LP: 1641549)

=== modified file 'debian/control'
--- debian/control	2015-09-02 08:45:46 +0000
+++ debian/control	2016-11-17 07:13:58 +0000
@@ -16,6 +16,8 @@
 Depends: cgmanager,
          debianutils,
          lxc (>= 1.1.0~alpha2-0ubuntu1),
+         lxd,
+         lxd-client,
          ${misc:Depends},
 Breaks: powerd (<< 0.14-0ubuntu1),
         ubuntu-touch-session (<< 0.107),

=== modified file 'debian/lxc-android-config.service'
--- debian/lxc-android-config.service	2016-10-04 08:14:24 +0000
+++ debian/lxc-android-config.service	2016-11-17 07:13:58 +0000
@@ -1,15 +1,16 @@
 [Unit]
 Description=LXC Android Config and Container Initialization
-Requires=cgmanager.service
+Requires=cgmanager.service lxd.service
 Wants=upstart-local-bridge.service
-After=cgmanager.service upstart-local-bridge.service
+After=cgmanager.service lxd.service upstart-local-bridge.service
+Before=lxd-containers.service
 
 [Service]
-Type=forking
+Type=oneshot
 ExecStartPre=/usr/lib/lxc-android-config/copy-udev-unflipped
-ExecStart=/usr/bin/lxc-start -n android -d -- /init
-ExecStartPost=/usr/lib/lxc-android-config/lxc-android-ready
-ExecStop=/usr/bin/lxc-stop -n android -k
+ExecStartPre=/usr/lib/lxc-android-config/create-lxd-image
+ExecStart=/usr/bin/lxc launch --force-local -e -p android android armhf
+ExecStop=/usr/bin/lxc stop --force armhf
 
 [Install]
 WantedBy=multi-user.target

=== modified file 'etc/system-image/writable-paths'
--- etc/system-image/writable-paths	2016-10-14 08:29:20 +0000
+++ etc/system-image/writable-paths	2016-11-17 07:13:58 +0000
@@ -68,3 +68,5 @@
 # snappy
 /snap                                   auto                    persistent  transition  none
 /var/lib/snapd                          auto                    persistent  transition  none
+# lxd
+/var/lib/lxd                            auto                    persistent  transition  none

=== added directory 'lib/systemd/system/urfkill.service.d'
=== added file 'lib/systemd/system/urfkill.service.d/lxc-android-config.conf'
--- lib/systemd/system/urfkill.service.d/lxc-android-config.conf	1970-01-01 00:00:00 +0000
+++ lib/systemd/system/urfkill.service.d/lxc-android-config.conf	2016-11-17 07:13:58 +0000
@@ -0,0 +1,3 @@
+[Unit]
+Wants=lxc-android-config.service
+After=lxc-android-config.service

=== added file 'usr/lib/lxc-android-config/create-lxd-image'
--- usr/lib/lxc-android-config/create-lxd-image	1970-01-01 00:00:00 +0000
+++ usr/lib/lxc-android-config/create-lxd-image	2016-11-17 07:13:58 +0000
@@ -0,0 +1,57 @@
+#!/bin/sh 
+
+set -e
+
+IMAGE_NAME=${1:-android}
+[ -z "$(lxc image --force-local list | grep ${IMAGE_NAME})" ] || exit 0
+
+WORKDIR=$(mktemp -d)
+trap "{ cd /; rm -rf '$WORKDIR'; }" EXIT
+cd "$WORKDIR"
+
+mkdir -p image/rootfs
+cat /android/system/boot/android-ramdisk.img | \
+  gzip -d | \
+  (cd image/rootfs; cpio -i)
+env LXC_ROOTFS_PATH="$WORKDIR"/image/rootfs run-parts /var/lib/lxc/android/pre-start.d || true
+sed -i "/mount_all /d" image/rootfs/init.*.rc || true
+sed -i "/on nonencrypted/d" image/rootfs/init.rc
+rm -Rf image/rootfs/vendor
+ln -s /system/vendor image/rootfs/vendor
+if [ -f /custom/custom.prop ]; then
+  cat /custom/custom.prop >> image/rootfs/default.prop
+fi
+
+cat >image/metadata.yaml <<EOF
+architecture: aarch64
+creation_date: $(date +%s)
+properties:
+  description: Ubuntu Touch device rootfs
+  os: android
+  release: 5.1
+EOF
+
+tar -C image -Jcpf rootfs.tar.xz metadata.yaml rootfs
+lxc image --force-local import rootfs.tar.xz --alias ${IMAGE_NAME}
+
+PROFILE_NAME=${2:-${IMAGE_NAME}}
+if [ -n "$(lxc profile --force-local list | grep ${PROFILE_NAME})" ]; then
+  lxc profile --force-local delete ${PROFILE_NAME}
+fi
+lxc profile --force-local create ${PROFILE_NAME}
+lxc profile --force-local set ${PROFILE_NAME} security.privileged true
+lxc profile --force-local set ${PROFILE_NAME} security.nesting true
+lxc profile --force-local set ${PROFILE_NAME} raw.lxc lxc.aa_profile=unconfined
+lxc profile --force-local device add ${PROFILE_NAME} \
+  dev_socket disk path=/dev/socket source=/dev/socket
+for dir in /android/*; do
+  name=$(basename $dir)
+  lxc profile --force-local device add ${PROFILE_NAME} \
+    $name disk path=/$name source=$dir recursive=true
+done
+lxc profile --force-local show ${PROFILE_NAME} | \
+  sed 's!  raw\.lxc: lxc.*$!  raw.lxc: |\n    lxc.devttydir=lxc\n    lxc.tty=4\n    lxc.cap.drop=mac_admin mac_override\n    lxc.aa_profile=unconfined\n    lxc.autodev=0\n    lxc.init_cmd=/init\n    lxc.cgroup.devices.allow = a\n    lxc.mount.auto=\n    lxc.mount.auto=sys:rw proc:mixed cgroup:mixed!' | \
+    sed 's!^description: .*$!description: "Ubuntu Touch android container"!' | \
+    lxc profile --force-local edit ${PROFILE_NAME}
+
+exit 0