From 2968bed32e40ccf103573be39408139e27f25f10 Mon Sep 17 00:00:00 2001
From: Josh Curl <josh@curl.me>
Date: Sat, 7 May 2016 15:08:39 -0700
Subject: [PATCH] Revert "/media and /mnt mounted as shared for console"

---
 init/init.go                                  |  3 ---
 os-config.tpl.yml                             |  2 --
 .../rostest/test_15_shared_mount.py           | 21 -------------------
 tests/integration/rostest/util.py             |  5 -----
 4 files changed, 31 deletions(-)
 delete mode 100644 tests/integration/rostest/test_15_shared_mount.py

diff --git a/init/init.go b/init/init.go
index 888a53e3..851e1961 100644
--- a/init/init.go
+++ b/init/init.go
@@ -229,9 +229,6 @@ func RunInit() error {
 			return c, nil
 		},
 		initializeSelinux,
-		func(c *config.CloudConfig) (*config.CloudConfig, error) {
-			return c, syscall.Mount("", "/", "", syscall.MS_SHARED|syscall.MS_REC, "")
-		},
 		sysInit,
 	}
 
diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index 726a4e4b..fb74be23 100644
--- a/os-config.tpl.yml
+++ b/os-config.tpl.yml
@@ -167,8 +167,6 @@ rancher:
       - all-volumes
       volumes:
       - /usr/bin/iptables:/sbin/iptables:ro
-      - /media:/media:shared
-      - /mnt:/mnt:shared
     container-data-volumes:
       image: {{.OS_IMAGES_ROOT}}/os-state:{{.VERSION}}{{.SUFFIX}}
       labels:
diff --git a/tests/integration/rostest/test_15_shared_mount.py b/tests/integration/rostest/test_15_shared_mount.py
deleted file mode 100644
index 9c0154f6..00000000
--- a/tests/integration/rostest/test_15_shared_mount.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import pytest
-import rostest.util as u
-from rostest.util import SSH
-
-
-@pytest.fixture(scope="module")
-def qemu(request):
-    q = u.run_qemu(request)
-    u.flush_out(q.stdout)
-    return q
-
-
-def test_shared_mount(qemu):
-    SSH(qemu).check_call('''
-set -x -e
-
-sudo mkdir /mnt/shared
-sudo touch /test
-sudo system-docker run --privileged -v /mnt:/mnt:shared -v /test:/test {busybox_image} mount --bind / /mnt/shared
-ls /mnt/shared | grep test
-    '''.format(busybox_image=u.busybox_image))
diff --git a/tests/integration/rostest/util.py b/tests/integration/rostest/util.py
index 86b2fc1f..e9be1a52 100644
--- a/tests/integration/rostest/util.py
+++ b/tests/integration/rostest/util.py
@@ -15,11 +15,6 @@ if arch != 'amd64':
     suffix = '_' + arch
 
 
-busybox_image = {'amd64': 'busybox',
-                 'arm': 'armhf/busybox',
-                 'arm64': 'aarch64/busybox'}[arch]
-
-
 def iter_lines(s):
     return it.imap(str.rstrip, iter(s.readline, ''))