Merge pull request #2845 from ijc/example-hostmount-writeable-overlay

Add an example of setting up a writeable overlay of a host path
2025-07-22 10:31:35 +00:00 · 2018-01-11 16:03:15 +00:00 · 2018-01-11 16:03:15 +00:00 · 965c678f9c
commit 965c678f9c
parent e3284d50e0 4476169fce
82 changed files with 152 additions and 94 deletions
--- a/blueprints/docker-for-mac/base.yml
+++ b/blueprints/docker-for-mac/base.yml
@ -4,7 +4,7 @@ kernel:
  cmdline: "console=ttyS0 page_poison=1"
 init:
  - linuxkit/vpnkit-expose-port:728e5fe9e6b818d9825b28826b929ae75a386e9e # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/aws.yml
+++ b/examples/aws.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/azure.yml
+++ b/examples/azure.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/cadvisor.yml
+++ b/examples/cadvisor.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/docker.yml
+++ b/examples/docker.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/gcp.yml
+++ b/examples/gcp.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/getty.yml
+++ b/examples/getty.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/hostmount-writeable-overlay.yml
+++ b/examples/hostmount-writeable-overlay.yml
@ -0,0 +1,47 @@
+kernel:
+  image: linuxkit/kernel:4.9.76
+  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
+init:
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
+  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
+  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
+  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
+onboot:
+  - name: sysctl
+    image: linuxkit/sysctl:4c1ef93bb5eb1a877318db4b2daa6768ed002e21
+  - name: dhcpcd
+    image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9
+    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
+onshutdown:
+  - name: shutdown
+    image: busybox:latest
+    command: ["/bin/echo", "so long and thanks for all the fish"]
+services:
+  - name: getty
+    image: linuxkit/getty:22e27189b6b354e1d5d38fc0536a5af3f2adb79f
+    env:
+     - INSECURE=true
+    runtime:
+      mounts:
+        # Makes a writeable (but private and non-persistent) mount of the
+        # host etc into the container.
+        - type: overlay
+          source: overlay
+          destination: writeable-host-etc
+          options: ["rw", "lowerdir=/etc", "upperdir=/run/hostetc/upper", "workdir=/run/hostetc/work"]
+  - name: rngd
+    image: linuxkit/rngd:94e01a4b16fadb053455cdc2269c4eb0b39199cd
+  - name: nginx
+    image: nginx:alpine
+    capabilities:
+     - CAP_NET_BIND_SERVICE
+     - CAP_CHOWN
+     - CAP_SETUID
+     - CAP_SETGID
+     - CAP_DAC_OVERRIDE
+    binds:
+     - /etc/resolv.conf:/etc/resolv.conf
+trust:
+  org:
+    - linuxkit
+    - library
--- a/examples/minimal.yml
+++ b/examples/minimal.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
 onboot:
--- a/examples/node_exporter.yml
+++ b/examples/node_exporter.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
 services:
--- a/examples/openstack.yml
+++ b/examples/openstack.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/packet.yml
+++ b/examples/packet.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS1 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/redis-os.yml
+++ b/examples/redis-os.yml
@ -4,7 +4,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
 onboot:
--- a/examples/sshd.yml
+++ b/examples/sshd.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/swap.yml
+++ b/examples/swap.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/tpm.yml
+++ b/examples/tpm.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.38
  cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/vmware.yml
+++ b/examples/vmware.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=tty0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/vpnkit-forwarder.yml
+++ b/examples/vpnkit-forwarder.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
 onboot:
--- a/examples/vsudd.yml
+++ b/examples/vsudd.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
 onboot:
--- a/examples/vultr.yml
+++ b/examples/vultr.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/examples/wireguard.yml
+++ b/examples/wireguard.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/linuxkit.yml
+++ b/linuxkit.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/pkg/init/cmd/service/prepare.go
+++ b/pkg/init/cmd/service/prepare.go
@ -144,11 +144,20 @@ func prepareFilesystem(path string, runtime Runtime) error {
 	// we execute Mounts before Mkdir so you can make a directory under a mount
 	// but we do mkdir of the destination path in case missing
 	rootfs := filepath.Join(path, "rootfs")
+	makeAbsolute := func(dir string) string {
+		if filepath.IsAbs(dir) {
+			return dir
+		}
+		// relative paths are relative to rootfs of container
+		return filepath.Join(rootfs, dir)
+	}
+
 	for _, mount := range runtime.Mounts {
 		const mode os.FileMode = 0755
-		err := os.MkdirAll(mount.Destination, mode)
+		dir := makeAbsolute(mount.Destination)
+		err := os.MkdirAll(dir, mode)
 		if err != nil {
-			return fmt.Errorf("Cannot create directory for mount destination %s: %v", mount.Destination, err)
+			return fmt.Errorf("Cannot create directory for mount destination %s: %v", dir, err)
 		}
 		// also mkdir upper and work directories on overlay
 		for _, o := range mount.Options {
@ -161,17 +170,14 @@ func prepareFilesystem(path string, runtime Runtime) error {
 			}
 		}
 		opts, data := parseMountOptions(mount.Options)
-		if err := unix.Mount(mount.Source, mount.Destination, mount.Type, uintptr(opts), data); err != nil {
+		if err := unix.Mount(mount.Source, dir, mount.Type, uintptr(opts), data); err != nil {
 			return fmt.Errorf("Failed to mount %s: %v", mount.Source, err)
 		}
 	}
 	for _, dir := range runtime.Mkdir {
 		// in future we may need to change the structure to set mode, ownership
 		const mode os.FileMode = 0755
-		// relative paths are relative to rootfs of container
-		if !filepath.IsAbs(dir) {
-			dir = filepath.Join(rootfs, dir)
-		}
+		dir = makeAbsolute(dir)
 		err := os.MkdirAll(dir, mode)
 		if err != nil {
 			return fmt.Errorf("Cannot create directory %s: %v", dir, err)
--- a/projects/clear-containers/clear-containers.yml
+++ b/projects/clear-containers/clear-containers.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel-clear-containers:4.9.x
  cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet  cryptomgr.notests page_poison=on"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
 onboot:
  - name: sysctl
    image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c
--- a/projects/compose/compose-dynamic.yml
+++ b/projects/compose/compose-dynamic.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/projects/compose/compose-static.yml
+++ b/projects/compose/compose-static.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/projects/ima-namespace/ima-namespace.yml
+++ b/projects/ima-namespace/ima-namespace.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148
  cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- 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:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
  - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
  - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
--- a/projects/logging/examples/logging.yml
+++ b/projects/logging/examples/logging.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=tty0 page_poison=1"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd # with runc, logwrite, startmemlogd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f # with runc, logwrite, startmemlogd
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/projects/memorizer/memorizer.yml
+++ b/projects/memorizer/memorizer.yml
@ -2,7 +2,7 @@ kernel:
  image: "linuxkitprojects/kernel-memorizer:4.10_dbg-17e2eee03ab59f8df8a9c10ace003a84aec2f540"
  cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
 onboot:
--- a/projects/miragesdk/examples/fdd.yml
+++ b/projects/miragesdk/examples/fdd.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.34
  cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/projects/miragesdk/examples/mirage-dhcp.yml
+++ b/projects/miragesdk/examples/mirage-dhcp.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
 onboot:
--- a/projects/okernel/examples/okernel_simple.yaml
+++ b/projects/okernel/examples/okernel_simple.yaml
@ -2,7 +2,7 @@ kernel:
  image: okernel:latest
  cmdline: "console=tty0 page_poison=1"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/projects/shiftfs/shiftfs.yml
+++ b/projects/shiftfs/shiftfs.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5
  cmdline: "console=ttyS0 console=tty0 page_poison=1"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/src/cmd/linuxkit/vendor.conf
+++ b/src/cmd/linuxkit/vendor.conf
@ -26,7 +26,7 @@ github.com/moby/datakit 97b3d230535397a813323902c23751e176481a86
 github.com/moby/hyperkit a12cd7250bcd8d689078e3e42ae4a7cf6a0cbaf3
 # When updating also:
 # curl -fsSL -o src/cmd/linuxkit/build.go https://raw.githubusercontent.com/moby/tool/«hash»/cmd/moby/build.go
-github.com/moby/tool 1aca4eefa5fcfb2248e6b2e4ce7251a9a3b5a60a
+github.com/moby/tool f816553d2fc58638f6904fddedd13c36d237b498
 github.com/moby/vpnkit 0e4293bb1058598c4b0a406ed171f52573ef414c
 github.com/opencontainers/go-digest 21dfd564fd89c944783d00d069f33e3e7123c448
 github.com/opencontainers/image-spec v1.0.0
--- a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/image.go
+++ b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/image.go
@ -229,6 +229,7 @@ func ImageBundle(prefix string, ref *reference.Spec, config []byte, runtime Runt
 		return err
 	}

+	var rootfsMounts []specs.Mount
 	if !readonly {
 		// add a tmp directory to be used as a mount point for tmpfs for upper, work
 		tmp := path.Join(prefix, "tmp")
@ -250,13 +251,12 @@ func ImageBundle(prefix string, ref *reference.Spec, config []byte, runtime Runt
 			return err
 		}
 		overlayOptions := []string{"lowerdir=/" + root, "upperdir=/" + path.Join(tmp, "upper"), "workdir=/" + path.Join(tmp, "work")}
-		runtimeMounts := append(*runtime.Mounts,
-			specs.Mount{Source: "tmpfs", Type: "tmpfs", Destination: "/" + tmp},
+		rootfsMounts = []specs.Mount{
+			{Source: "tmpfs", Type: "tmpfs", Destination: "/" + tmp},
 			// remount private as nothing else should see the temporary layers
-			specs.Mount{Destination: "/" + tmp, Options: []string{"remount", "private"}},
-			specs.Mount{Source: "overlay", Type: "overlay", Destination: "/" + path.Join(prefix, "rootfs"), Options: overlayOptions},
-		)
-		runtime.Mounts = &runtimeMounts
+			{Destination: "/" + tmp, Options: []string{"remount", "private"}},
+			{Source: "overlay", Type: "overlay", Destination: "/" + path.Join(prefix, "rootfs"), Options: overlayOptions},
+		}
 	} else {
 		if foundElsewhere {
 			// we need to make the mountpoint at rootfs
@ -270,10 +270,15 @@ func ImageBundle(prefix string, ref *reference.Spec, config []byte, runtime Runt
 			}
 		}
 		// either bind from another location, or bind from self to make sure it is a mountpoint as runc prefers this
-		runtimeMounts := append(*runtime.Mounts, specs.Mount{Source: "/" + root, Destination: "/" + path.Join(prefix, "rootfs"), Options: []string{"bind"}})
-		runtime.Mounts = &runtimeMounts
+		rootfsMounts = []specs.Mount{
+			{Source: "/" + root, Destination: "/" + path.Join(prefix, "rootfs"), Options: []string{"bind"}},
+		}
 	}

+	// Prepend the rootfs onto the user specified mounts.
+	runtimeMounts := append(rootfsMounts, *runtime.Mounts...)
+	runtime.Mounts = &runtimeMounts
+
 	// write the runtime config
 	runtimeConfig, err := json.MarshalIndent(runtime, "", "    ")
 	if err != nil {
--- a/test/cases/000_build/000_formats/test.yml
+++ b/test/cases/000_build/000_formats/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: dhcpcd
--- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml
+++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: poweroff
--- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml
+++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: poweroff
--- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml
+++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: poweroff
--- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml
+++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: poweroff
--- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml
+++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: poweroff
--- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml
+++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: poweroff
--- a/test/cases/010_platforms/000_qemu/100_container/test.yml
+++ b/test/cases/010_platforms/000_qemu/100_container/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: poweroff
--- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml
+++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: poweroff
--- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml
+++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
 services:
--- a/test/cases/020_kernel/000_config_4.4.x/test.yml
+++ b/test/cases/020_kernel/000_config_4.4.x/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.4.111
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: check-kernel-config
--- a/test/cases/020_kernel/001_config_4.9.x/test.yml
+++ b/test/cases/020_kernel/001_config_4.9.x/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: check-kernel-config
--- a/test/cases/020_kernel/006_config_4.14.x/test.yml
+++ b/test/cases/020_kernel/006_config_4.14.x/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.14.13
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: check-kernel-config
--- a/test/cases/020_kernel/010_kmod_4.4.x/test.yml
+++ b/test/cases/020_kernel/010_kmod_4.4.x/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.4.111
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: check
--- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml
+++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: check
--- a/test/cases/020_kernel/016_kmod_4.14.x/test.yml
+++ b/test/cases/020_kernel/016_kmod_4.14.x/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.14.13
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: check
--- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml
+++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.4.111
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 trust:
  org:
--- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml
+++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 trust:
  org:
--- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml
+++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.14.13
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 trust:
  org:
--- a/test/cases/030_security/000_docker-bench/test.yml
+++ b/test/cases/030_security/000_docker-bench/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/test/cases/030_security/010_ports/test.yml
+++ b/test/cases/030_security/010_ports/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: test
--- a/test/cases/040_packages/002_binfmt/test.yml
+++ b/test/cases/040_packages/002_binfmt/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: binfmt
--- a/test/cases/040_packages/003_ca-certificates/test.yml
+++ b/test/cases/040_packages/003_ca-certificates/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
 onboot:
--- a/test/cases/040_packages/003_containerd/test.yml
+++ b/test/cases/040_packages/003_containerd/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/test/cases/040_packages/004_dhcpcd/test.yml
+++ b/test/cases/040_packages/004_dhcpcd/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: dhcpcd
--- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml
+++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: format
--- a/test/cases/040_packages/005_extend/000_ext4/test.yml
+++ b/test/cases/040_packages/005_extend/000_ext4/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: extend
--- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml
+++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: modprobe
--- a/test/cases/040_packages/005_extend/001_btrfs/test.yml
+++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: modprobe
--- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml
+++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: format
--- a/test/cases/040_packages/005_extend/002_xfs/test.yml
+++ b/test/cases/040_packages/005_extend/002_xfs/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: extend
--- a/test/cases/040_packages/006_format_mount/000_auto/test.yml
+++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: format
--- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml
+++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: format
--- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in
+++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.38
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: format
--- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml
+++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: modprobe
--- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml
+++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: format
--- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml
+++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.51
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: format
--- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml
+++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: format
--- a/test/cases/040_packages/007_getty-containerd/test.yml
+++ b/test/cases/040_packages/007_getty-containerd/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.x
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/test/cases/040_packages/013_mkimage/mkimage.yml
+++ b/test/cases/040_packages/013_mkimage/mkimage.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: mkimage
--- a/test/cases/040_packages/013_mkimage/run.yml
+++ b/test/cases/040_packages/013_mkimage/run.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: poweroff
--- a/test/cases/040_packages/019_sysctl/test.yml
+++ b/test/cases/040_packages/019_sysctl/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: sysctl
--- a/test/cases/040_packages/023_wireguard/test.yml
+++ b/test/cases/040_packages/023_wireguard/test.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
  - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
--- a/test/hack/test-ltp.yml
+++ b/test/hack/test-ltp.yml
@ -2,7 +2,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
 onboot:
--- a/test/hack/test.yml
+++ b/test/hack/test.yml
@ -4,7 +4,7 @@ kernel:
  image: linuxkit/kernel:4.9.76
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
  - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b
 onboot:
--- a/test/pkg/ns/template.yml
+++ b/test/pkg/ns/template.yml
@ -3,7 +3,7 @@ kernel:
  image: linuxkit/kernel:4.9.38
  cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd
+  - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f
  - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
 onboot:
  - name: test-ns