Merge pull request cri-o#1526 from giuseppe/system-container-use-bind-mount-prefix

Mrunal Patel · web-flow · commit a221a5d83d8f · 2018-04-29T12:37:57.000-07:00
syscontainers: use --bind-mount-prefix
diff --git a/contrib/system_containers/centos/config.json.template b/contrib/system_containers/centos/config.json.template
@@ -297,28 +297,6 @@
             "source": "/root",
             "type": "bind"
         },
-        {
-            "destination": "/home",
-            "options": [
-                "rbind",
-                "rprivate",
-                "rw",
-                "mode=755"
-            ],
-            "source": "/home",
-            "type": "bind"
-        },
-        {
-            "destination": "/mnt",
-            "options": [
-                "rbind",
-                "rw",
-                "rprivate",
-                "mode=755"
-            ],
-            "source": "/mnt",
-            "type": "bind"
-        },
 	{
 	    "type": "bind",
 	    "source": "${RUN_DIRECTORY}",
@@ -413,6 +391,16 @@
             "source": "/dev",
             "type": "bind"
         },
+        {
+            "destination": "/host",
+            "options": [
+                "rbind",
+                "rshared",
+                "rw"
+            ],
+            "source": "/",
+            "type": "bind"
+        },
         {
             "destination": "/sys",
             "options": [
diff --git a/contrib/system_containers/centos/run.sh b/contrib/system_containers/centos/run.sh
@@ -8,4 +8,4 @@ printf %s $LABEL > /proc/self/attr/exec
 test -e /etc/sysconfig/crio-storage && source /etc/sysconfig/crio-storage
 test -e /etc/sysconfig/crio-network && source /etc/sysconfig/crio-network
 
-exec /usr/bin/crio --log-level=$LOG_LEVEL
+exec /usr/bin/crio --bind-mount-prefix=/host --log-level=$LOG_LEVEL
diff --git a/contrib/system_containers/fedora/config.json.template b/contrib/system_containers/fedora/config.json.template
@@ -302,28 +302,6 @@
             "source": "/root",
             "type": "bind"
         },
-        {
-            "destination": "/home",
-            "options": [
-                "rbind",
-                "rprivate",
-                "rw",
-                "mode=755"
-            ],
-            "source": "/home",
-            "type": "bind"
-        },
-        {
-            "destination": "/mnt",
-            "options": [
-                "rbind",
-                "rw",
-                "rprivate",
-                "mode=755"
-            ],
-            "source": "/mnt",
-            "type": "bind"
-        },
 	{
 	    "type": "bind",
 	    "source": "${RUN_DIRECTORY}",
@@ -418,6 +396,16 @@
             "source": "/dev",
             "type": "bind"
         },
+        {
+            "destination": "/host",
+            "options": [
+                "rbind",
+                "rshared",
+                "rw"
+            ],
+            "source": "/",
+            "type": "bind"
+        },
         {
             "destination": "/sys",
             "options": [
diff --git a/contrib/system_containers/fedora/run.sh b/contrib/system_containers/fedora/run.sh
@@ -8,4 +8,4 @@ printf %s $LABEL > /proc/self/attr/exec
 test -e /etc/sysconfig/crio-storage && source /etc/sysconfig/crio-storage
 test -e /etc/sysconfig/crio-network && source /etc/sysconfig/crio-network
 
-exec /usr/bin/crio --log-level=$LOG_LEVEL
+exec /usr/bin/crio --bind-mount-prefix=/host --log-level=$LOG_LEVEL
diff --git a/contrib/system_containers/rhel/config.json.template b/contrib/system_containers/rhel/config.json.template
@@ -292,28 +292,6 @@
       "source": "/root",
       "type": "bind"
     },
-    {
-      "destination": "/home",
-      "options": [
-        "rbind",
-        "rprivate",
-        "rw",
-        "mode=755"
-      ],
-      "source": "/home",
-      "type": "bind"
-    },
-    {
-      "destination": "/mnt",
-      "options": [
-        "rbind",
-        "rw",
-        "rprivate",
-        "mode=755"
-      ],
-      "source": "/mnt",
-      "type": "bind"
-    },
     {
       "type": "bind",
       "source": "${RUN_DIRECTORY}",
@@ -408,6 +386,16 @@
       "source": "/dev",
       "type": "bind"
     },
+    {
+      "destination": "/host",
+      "options": [
+        "rbind",
+        "rshared",
+        "rw"
+      ],
+      "source": "/",
+      "type": "bind"
+    },
     {
       "destination": "/sys",
       "options": [
diff --git a/contrib/system_containers/rhel/run.sh b/contrib/system_containers/rhel/run.sh
@@ -8,4 +8,4 @@ printf %s $LABEL > /proc/self/attr/exec
 test -e /etc/sysconfig/crio-storage && source /etc/sysconfig/crio-storage
 test -e /etc/sysconfig/crio-network && source /etc/sysconfig/crio-network
 
-exec /usr/bin/crio --log-level=$LOG_LEVEL
+exec /usr/bin/crio --bind-mount-prefix=/host --log-level=$LOG_LEVEL
