Merge pull request #1797 from justincormack/init-dirs

Remove making directories from init
This commit is contained in:
Justin Cormack 2017-05-10 12:00:56 +01:00 committed by GitHub
commit 38d21aab4b
5 changed files with 4 additions and 6 deletions

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:6c9b2dfac4ac446e57ad83e9817db4b5a334301c - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:987b62d8411bc92f092e6e6e8d1038c4e06f0a53 - linuxkit/containerd:987b62d8411bc92f092e6e6e8d1038c4e06f0a53
onboot: onboot:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:6c9b2dfac4ac446e57ad83e9817db4b5a334301c - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d - linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d
services: services:

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:6c9b2dfac4ac446e57ad83e9817db4b5a334301c - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:987b62d8411bc92f092e6e6e8d1038c4e06f0a53 - linuxkit/containerd:987b62d8411bc92f092e6e6e8d1038c4e06f0a53
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288

View File

@ -1,8 +1,6 @@
#!/bin/sh #!/bin/sh
# mount filesystems # mount filesystems
mkdir -p -m 0755 /proc /run /tmp /sys /dev
mount -n -t proc proc /proc -o nodev,nosuid,noexec,relatime mount -n -t proc proc /proc -o nodev,nosuid,noexec,relatime
mount -n -t tmpfs tmpfs /run -o nodev,nosuid,noexec,relatime,size=10%,mode=755 mount -n -t tmpfs tmpfs /run -o nodev,nosuid,noexec,relatime,size=10%,mode=755

View File

@ -2,7 +2,7 @@ kernel:
image: "linuxkit/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- linuxkit/init:6c9b2dfac4ac446e57ad83e9817db4b5a334301c - linuxkit/init:deea956a9ab07bf262083e93a86930bdc610cc2f
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d - linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288 - linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288