Merge pull request #1550 from justincormack/rootfs-mountpoint

Make each rootfs a mountpoint by binding
This commit is contained in:
Justin Cormack 2017-04-09 09:52:23 +01:00 committed by GitHub
commit e0aced6be0
9 changed files with 10 additions and 8 deletions

View File

@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

View File

@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

View File

@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

View File

@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=tty0 page_poison=1"
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

View File

@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

View File

@ -7,6 +7,7 @@ then
for f in $(find /containers/onboot -mindepth 1 -maxdepth 1 | sort)
do
base="$(basename $f)"
/bin/mount --bind "$f/rootfs" "$f/rootfs"
/usr/bin/runc run --bundle "$f" "$(basename $f)"
printf " - $base\n"
done
@ -20,6 +21,7 @@ then
for f in $(find /containers/services -mindepth 1 -maxdepth 1 | sort)
do
base="$(basename $f)"
/bin/mount --bind "$f/rootfs" "$f/rootfs"
log="/var/log/$base.log"
/sbin/start-stop-daemon --start --pidfile /run/$base.pid --exec /usr/bin/runc -- run --bundle "$f" --pid-file /run/$base.pid "$(basename $f)" </dev/null 2>$log >$log &
printf " - $base\n"

View File

@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

View File

@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0"
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

View File

@ -6,7 +6,7 @@ kernel:
image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1"
init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862
- mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935