From a86a5847f8fea12e0fe57103ac0abe179c27cd2c Mon Sep 17 00:00:00 2001
From: Simon Fels <morphis@gravedo.de>
Date: Sun, 4 Dec 2016 17:16:55 +0100
Subject: [PATCH] Start bridge as part of the container manager

---
 scripts/container-manager.sh | 10 +++++++++-
 snapcraft.yaml               | 10 ++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/scripts/container-manager.sh b/scripts/container-manager.sh
index 60a4327..864c17a 100755
--- a/scripts/container-manager.sh
+++ b/scripts/container-manager.sh
@@ -29,4 +29,12 @@ chmod 666 /dev/ashmem
 # this path.
 mkdir -p $SNAP_COMMON/lxc
 
-exec $SNAP/usr/sbin/aa-exec -p unconfined -- $SNAP/bin/anbox-wrapper.sh container-manager
+# We start the bridge here as long as a oneshot service unit is not
+# possible. See snapcraft.yaml for further details.
+$SNAP/bin/anbox-bridge.sh start
+
+$SNAP/usr/sbin/aa-exec -p unconfined -- $SNAP/bin/anbox-wrapper.sh container-manager
+pid=$!
+waitpid $pid
+
+$SNAP/bin/anbox-bridge.sh stop
diff --git a/snapcraft.yaml b/snapcraft.yaml
index a066de7..40352db 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -14,10 +14,12 @@ apps:
   container-manager:
     command: bin/container-manager.sh
     daemon: simple
-  bridge:
-    command: bin/anbox-bridge.sh start
-    stop-command: bin/anbox-bridge.sh stop
-    daemon: oneshot
+# FIXME: a oneshot unit with start/stop commands needs also RemainAfterExit=yes
+# but this isn't supported by snapd yet. See LP #1647169 for details.
+#  bridge:
+#    command: bin/anbox-bridge.sh start
+#    stop-command: bin/anbox-bridge.sh stop
+#    daemon: oneshot
 
 parts:
   android-rootfs: