From 3c326bebdfdcd7bf1f8d54540578f5661c09ce1d Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 12 Apr 2017 13:10:46 +0100 Subject: [PATCH] Make / rshared Previously only `/var` was `rshared` but some people need to share mounts in `/opt` etc so let us make everything `rshared` for now. Signed-off-by: Justin Cormack --- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/sshd.yml | 2 +- examples/vmware.yml | 2 +- linuxkit.yml | 2 +- pkg/init/etc/init.d/rcS | 3 +++ projects/demo/etcd/etcd.yml | 2 +- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- projects/landlock/landlock.yml | 2 +- test/docker-bench/test-docker-bench.yml | 2 +- test/ltp/test-ltp.yml | 2 +- test/test.yml | 2 +- test/virtsock/test-virtsock-server.yml | 2 +- 14 files changed, 16 insertions(+), 13 deletions(-) diff --git a/examples/docker.yml b/examples/docker.yml index e691ff254..53cab45bb 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:e10e2efc1b78ef41d196175cbc07e069391f406e + - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/examples/gcp.yml b/examples/gcp.yml index 68460cb7e..7386a52eb 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - mobylinux/init:e10e2efc1b78ef41d196175cbc07e069391f406e + - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/examples/sshd.yml b/examples/sshd.yml index 87a106aa7..e7deeaa34 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - mobylinux/init:e10e2efc1b78ef41d196175cbc07e069391f406e + - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/examples/vmware.yml b/examples/vmware.yml index a25df911d..7c99dcbed 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=tty0 page_poison=1" init: - - mobylinux/init:e10e2efc1b78ef41d196175cbc07e069391f406e + - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/linuxkit.yml b/linuxkit.yml index 8e0c6ae19..2b2d73925 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:e10e2efc1b78ef41d196175cbc07e069391f406e + - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/pkg/init/etc/init.d/rcS b/pkg/init/etc/init.d/rcS index 1abe92d85..fdd1faea4 100755 --- a/pkg/init/etc/init.d/rcS +++ b/pkg/init/etc/init.d/rcS @@ -109,3 +109,6 @@ mount -o remount,ro / mount -o bind /var /var mount -o remount,rw,nodev,nosuid,noexec,relatime /var /var mount --make-rshared /var + +# make / rshared +mount --make-rshared / diff --git a/projects/demo/etcd/etcd.yml b/projects/demo/etcd/etcd.yml index 82b81006a..c14103dc3 100644 --- a/projects/demo/etcd/etcd.yml +++ b/projects/demo/etcd/etcd.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:e10e2efc1b78ef41d196175cbc07e069391f406e + - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index a4b645828..011614370 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:e10e2efc1b78ef41d196175cbc07e069391f406e + - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 855df2c06..09fdab27d 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:e10e2efc1b78ef41d196175cbc07e069391f406e + - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index a6c39db28..04bf3d448 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel-landlock:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - mobylinux/init:e10e2efc1b78ef41d196175cbc07e069391f406e + - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/test/docker-bench/test-docker-bench.yml b/test/docker-bench/test-docker-bench.yml index b07086398..6414721f3 100644 --- a/test/docker-bench/test-docker-bench.yml +++ b/test/docker-bench/test-docker-bench.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:e10e2efc1b78ef41d196175cbc07e069391f406e + - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/test/ltp/test-ltp.yml b/test/ltp/test-ltp.yml index 31428ff0f..4cf199526 100644 --- a/test/ltp/test-ltp.yml +++ b/test/ltp/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" init: - - mobylinux/init:e10e2efc1b78ef41d196175cbc07e069391f406e + - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/test/test.yml b/test/test.yml index babc60331..0a49c4a2e 100644 --- a/test/test.yml +++ b/test/test.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" init: - - mobylinux/init:e10e2efc1b78ef41d196175cbc07e069391f406e + - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/test/virtsock/test-virtsock-server.yml b/test/virtsock/test-virtsock-server.yml index 14b374518..105657b98 100644 --- a/test/virtsock/test-virtsock-server.yml +++ b/test/virtsock/test-virtsock-server.yml @@ -6,7 +6,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - mobylinux/init:e10e2efc1b78ef41d196175cbc07e069391f406e + - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935