pkg/init support for volumes

Signed-off-by: Avi Deitcher <avi@deitcher.net>

examples/addbinds.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/cadvisor.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/containerd-debug.yml

@@ -3,7 +3,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/dm-crypt-loop.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/dm-crypt.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/docker-for-mac.yml

@@ -4,7 +4,7 @@ kernel:
   cmdline: "console=ttyS0 page_poison=1"
 init:
   - linuxkit/vpnkit-expose-port:77e45e4681c78d59f1d8a48818260948d55f9d05 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/docker.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/getty.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/hostmount-writeable-overlay.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/influxdb-os.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/logging.yml

@@ -3,7 +3,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/minimal.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:

examples/node_exporter.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 services:

examples/openstack.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/platform-aws.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/platform-azure.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/platform-equinixmetal.yml

@@ -3,7 +3,7 @@ kernel:
   cmdline: console=ttyS1
   ucode: intel-ucode.cpio
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/platform-gcp.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/platform-hetzner.yml

@@ -3,7 +3,7 @@ kernel:
   cmdline: console=ttyS1
   ucode: intel-ucode.cpio
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/platform-rt-for-vmware.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13-rt
   cmdline: "console=tty0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/platform-scaleway.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/platform-vmware.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/platform-vultr.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/redis-os.yml

@@ -4,7 +4,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:

examples/sshd.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/static-ip.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:

examples/swap.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/tpm.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

examples/volumes.yml

@@ -3,9 +3,9 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:8a7b6cdb89197dc94eb6db69ef9dc90b750db598
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
-  - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad
+  - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff
 onboot:
   - name: sysctl

examples/vpnkit-forwarder.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:

examples/vsudd-containerd.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:

examples/wireguard.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

linuxkit.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

pkg/init/Dockerfile

@@ -24,6 +24,9 @@ COPY --from=containerd-dev /go/src/github.com/containerd/containerd $GOPATH/src/
 RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd
 RUN go-compile.sh /go/src/cmd/service
 
+# volumes link to start
+RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/005-volumes
+
 FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl
@@ -34,6 +37,7 @@ RUN mkdir -p /out/etc/ssl/certs
 # Remove cache residuals. We retain apk for SBOM tools
 RUN rm -rf /out/var/cache
 
+
 FROM scratch
 ENTRYPOINT []
 CMD []
@@ -42,5 +46,6 @@ COPY --from=build /go/bin/init /
 COPY --from=build /tmp/bin /bin/
 COPY --from=build /go/bin/service /usr/bin/
 COPY --from=build usermode-helper /sbin/
+COPY --from=build /etc/init.d/ /etc/init.d/
 COPY --from=mirror /out/ /
 COPY etc etc/

pkg/init/cmd/service/cmd.go

@@ -25,7 +25,7 @@ func parseCmd(ctx context.Context, command string, args []string) (*log.Entry, s
 	}
 
 	sock := flags.String("sock", defaultSocket, "Path to containerd socket")
-	path := flags.String("path", defaultPath, "Path to service configs")
+	path := flags.String("path", defaultServicesPath, "Path to service configs")
 
 	dumpSpec := flags.String("dump-spec", "", "Dump container spec to file before start")
 

pkg/init/cmd/service/main.go

@@ -14,7 +14,8 @@ import (
 
 const (
 	defaultSocket              = "/run/containerd/containerd.sock"
-	defaultPath                = "/containers/services"
+	defaultServicesPath        = "/containers/services"
+	defaultVolumesPath         = "/containers/volumes"
 	defaultContainerd          = "/usr/bin/containerd"
 	installPath                = "/usr/bin/service"
 	onbootPath                 = "/containers/onboot"
@@ -84,6 +85,8 @@ func main() {
 		// check if called form startup scripts
 		command := os.Args[0]
 		switch {
+		case strings.Contains(command, "volumes"):
+			os.Exit(volumeInitCmd(ctx))
 		case strings.Contains(command, "onboot"):
 			os.Exit(runcInit(onbootPath, "onboot"))
 		case strings.Contains(command, "onshutdown"):

pkg/init/cmd/service/system_init.go

@@ -67,7 +67,7 @@ func systemInitCmd(ctx context.Context, args []string) {
 	}
 
 	sock := flags.String("sock", defaultSocket, "Path to containerd socket")
-	path := flags.String("path", defaultPath, "Path to service configs")
+	path := flags.String("path", defaultServicesPath, "Path to service configs")
 	binary := flags.String("containerd", defaultContainerd, "Path to containerd")
 
 	if err := flags.Parse(args); err != nil {

pkg/init/cmd/service/volumeinit.go

@@ -0,0 +1,95 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	log "github.com/sirupsen/logrus"
+	"golang.org/x/sys/unix"
+)
+
+func volumeInitCmd(ctx context.Context) int {
+	invoked := filepath.Base(os.Args[0])
+	flags := flag.NewFlagSet("volume", flag.ExitOnError)
+	flags.Usage = func() {
+		fmt.Printf("USAGE: %s volume\n\n", invoked)
+		fmt.Printf("Options:\n")
+		flags.PrintDefaults()
+	}
+
+	path := flags.String("path", defaultVolumesPath, "Path to volume configs")
+
+	// Set up volumes
+	vols, err := os.ReadDir(*path)
+	// just skip if there is an error, eg no such path
+	if err != nil {
+		return 1
+	}
+	// go through each volume, ensure that the volPath/merged exists as a directory,
+	// and is one of:
+	// - read-only: i.e. no tmp exists, merged bindmounted to lower
+	// - read-write: i.e. tmp exists, overlayfs lower/upper/merged
+	for _, vol := range vols {
+		subs, err := os.ReadDir(filepath.Join(*path, vol.Name()))
+		if err != nil {
+			log.WithError(err).Errorf("Error reading volume %s", vol.Name())
+			return 1
+		}
+		var hasLower, hasMerged, readWrite bool
+		for _, sub := range subs {
+			switch sub.Name() {
+			case "lower":
+				hasLower = true
+			case "tmp":
+				readWrite = true
+			case "merged":
+				hasMerged = true
+			}
+		}
+		if !hasMerged {
+			log.Errorf("Volume %s does not have a merged directory", vol.Name())
+			return 1
+		}
+		if !hasLower {
+			log.Errorf("Volume %s does not have a lower directory", vol.Name())
+			return 1
+		}
+		lowerDir := filepath.Join(*path, vol.Name(), "lower")
+		mergedDir := filepath.Join(*path, vol.Name(), "merged")
+		if !readWrite {
+			log.Infof("Volume %s is read-only, bind-mounting read-only", vol.Name())
+			if err := unix.Mount(lowerDir, mergedDir, "bind", unix.MS_RDONLY, ""); err != nil {
+				log.WithError(err).Errorf("Error bind-mounting volume %s", vol.Name())
+				return 1
+			}
+		} else {
+			log.Infof("Volume %s is read-write, overlay mounting", vol.Name())
+			// need a tmpfs to create the workdir and upper
+			tmpDir := filepath.Join(*path, vol.Name(), "tmp")
+			if err := unix.Mount("tmpfs", tmpDir, "tmpfs", unix.MS_RELATIME, ""); err != nil {
+				log.WithError(err).Errorf("Error creating tmpDir for volume %s", vol.Name())
+				return 1
+			}
+			workDir := filepath.Join(tmpDir, "work")
+			upperDir := filepath.Join(tmpDir, "upper")
+			if err := os.Mkdir(upperDir, 0755); err != nil {
+				log.WithError(err).Errorf("Error creating upper dir for volume %s", vol.Name())
+				return 1
+			}
+			if err := os.Mkdir(workDir, 0755); err != nil {
+				log.WithError(err).Errorf("Error creating work dir for volume %s", vol.Name())
+				return 1
+			}
+			// and let's mount the actual dir
+			data := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", lowerDir, upperDir, workDir)
+			if err := unix.Mount("overlay", mergedDir, "overlay", unix.MS_RELATIME, data); err != nil {
+				log.WithError(err).Errorf("Error overlay-mounting volume %s", vol.Name())
+				return 1
+			}
+		}
+	}
+	return 0
+}

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:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
 onboot:
   - name: sysctl
     image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c

projects/compose/compose-dynamic.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

projects/compose/compose-static.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

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:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

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:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
   - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
   - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

projects/memorizer/memorizer.yml

@@ -2,7 +2,7 @@ kernel:
   image: "linuxkitprojects/kernel-memorizer:4.10_dbg"
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:

projects/miragesdk/examples/fdd.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

projects/miragesdk/examples/mirage-dhcp.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:

projects/okernel/examples/okernel_simple.yaml

@@ -2,7 +2,7 @@ kernel:
   image: okernel:latest
   cmdline: "console=tty0 page_poison=1"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

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:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

src/cmd/linuxkit/moby/build/mkimage.yaml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: mkimage

test/cases/000_build/000_formats/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: dhcpcd

test/cases/000_build/001_tarheaders/test.yml

@@ -3,7 +3,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 

test/cases/000_build/010_reproducible/test.yml

@@ -3,7 +3,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 

test/cases/000_build/020_binds/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: mount

test/cases/000_build/050_sbom/test.yml

@@ -3,7 +3,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 

test/cases/000_build/060_input_tar/000_build/test1.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:

test/cases/000_build/060_input_tar/000_build/test2.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
   - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff

test/cases/000_build/060_input_tar/010_same_filename/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 onboot:

test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: poweroff

test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: poweroff

test/cases/010_platforms/000_qemu/010_run_iso/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: poweroff

test/cases/010_platforms/000_qemu/020_run_efi/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: poweroff

test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: poweroff

test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: poweroff

test/cases/010_platforms/000_qemu/050_run_aws/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: poweroff

test/cases/010_platforms/000_qemu/100_container/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: poweroff

test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: poweroff

test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: poweroff

test/cases/010_platforms/010_hyperkit/010_acpi/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
   - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435
 services:

test/cases/010_platforms/110_gcp/000_run/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: poweroff

test/cases/020_kernel/011_config_5.4.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:5.4.172-9005a97e2b2cba68b4374092167b079a2874f66b
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: check-kernel-config

test/cases/020_kernel/013_config_5.10.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: check-kernel-config

test/cases/020_kernel/016_config_5.15.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:5.15.27-9005a97e2b2cba68b4374092167b079a2874f66b
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: check-kernel-config

test/cases/020_kernel/019_config_6.6.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13-44a5293614ca7c7674013e928cb11dcdbba73ba8
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: check-kernel-config

test/cases/020_kernel/111_kmod_5.4.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:5.4.172-9005a97e2b2cba68b4374092167b079a2874f66b
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: check

test/cases/020_kernel/113_kmod_5.10.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: check

test/cases/020_kernel/116_kmod_5.15.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:5.15.27-9005a97e2b2cba68b4374092167b079a2874f66b
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: check

test/cases/020_kernel/119_kmod_6.6.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:6.6.13-44a5293614ca7c7674013e928cb11dcdbba73ba8
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9
+  - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b
   - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f
 onboot:
   - name: check

test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1", "-r"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1", "-r"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1", "-r"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1", "-r"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"]
     mounts: # for runc
     - type: cgroup

test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml

@@ -1,6 +1,6 @@
 onboot:
   - name: test-ns
-    image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d
+    image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f
     command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"]
     mounts: # for runc
     - type: cgroup