From ec8637ef6d0bc5bf69eb03aa1461b549e02a136f Mon Sep 17 00:00:00 2001
From: Hidehiko Abe <hidehiko@google.com>
Date: Wed, 9 Mar 2016 16:41:50 +0900
Subject: [PATCH] Split slave-bind mount into two.

mount(2) does not work with MS_BIND | MS_SLAVE at a time.
Instead, this CL calls mount twice.

Change-Id: I36b2eb2853f19efc2b0677fb07b6822392aac37c
---
 rootdir/init.rc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 194b41baf..32fa4c491 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -271,7 +271,8 @@ on post-fs
     # Mount shared so changes propagate into child namespaces
     mount rootfs rootfs / shared rec
     # Mount default storage into root namespace
-    mount none /mnt/runtime/default /storage slave bind rec
+    mount none /mnt/runtime/default /storage bind rec
+    mount none none /storage slave rec
 
     # Make sure /sys/kernel/debug (if present) is labeled properly
     restorecon_recursive /sys/kernel/debug