Merge pull request #3114 from djs55/kmsg.stderr

Write stderr to /var/log/<name>.log

contrib/crosvm/README.md

@@ -33,7 +33,7 @@ kernel:
   image: linuxkit/kernel:4.9.91
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
 services:

examples/aws.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/azure.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/cadvisor.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/docker-for-mac.yml

@@ -4,7 +4,7 @@ kernel:
   cmdline: "console=ttyS0 page_poison=1"
 init:
   - linuxkit/vpnkit-expose-port:v0.5 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/docker.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/gcp.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/getty.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/hostmount-writeable-overlay.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/influxdb-os.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/logging.yml

@@ -3,7 +3,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5
@@ -27,7 +27,7 @@ services:
   - name: write-and-rotate-logs
     image: linuxkit/logwrite:d9778c0d538094d398cf0cbfc89277aeca67f1be
   - name: kmsg
-    image: linuxkit/kmsg:v0.5
+    image: linuxkit/kmsg:cf3dc833591838596427aac032c829ea592599d0
 trust:
   org:
     - linuxkit

examples/minimal.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
 onboot:

examples/node_exporter.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
 services:

examples/openstack.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/packet.yml

@@ -3,7 +3,7 @@ kernel:
   cmdline: console=ttyS1
   ucode: intel-ucode.cpio
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/redis-os.yml

@@ -4,7 +4,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
 onboot:

examples/rt-for-vmware.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54-rt
   cmdline: "console=tty0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/scaleway.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/sshd.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/swap.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/tpm.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.9.38
   cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/vmware.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/vpnkit-forwarder.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
 onboot:

examples/vsudd-containerd.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
 onboot:

examples/vultr.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

examples/wireguard.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

linuxkit.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

pkg/init/cmd/service/cmd.go

@@ -202,7 +202,7 @@ func start(ctx context.Context, service, sock, basePath, dumpSpec string) (strin
 
 	io := func(id string) (cio.IO, error) {
 		stdoutFile := logger.Path(service + ".out")
-		stderrFile := logger.Path(service + ".err")
+		stderrFile := logger.Path(service)
 		return &logio{
 			cio.Config{
 				Stdin:    "/dev/null",

pkg/init/cmd/service/logging.go

@@ -29,6 +29,7 @@ type Log interface {
 	Path(string) string                  // Path of the log file (may be a FIFO)
 	Open(string) (io.WriteCloser, error) // Opens a log stream
 	Dump(string)                         // Copies logs to the console
+	Symlink(string)                      // Symlinks to the log directory (if there is one)
 }
 
 // GetLog returns the log destination we should use.
@@ -82,6 +83,16 @@ func (f *fileLog) Dump(n string) {
 	}
 }
 
+// Symlinks to the log directory. This is useful if we are logging directly to tmpfs and now need to symlink from a permanent disk.
+func (f *fileLog) Symlink(path string) {
+	parent := filepath.Dir(path)
+	if err := os.MkdirAll(parent, 0755); err != nil {
+		log.Printf("Error creating secondary log directory %s: %v", parent, err)
+	} else if err := os.Symlink(f.dir, path); err != nil && !os.IsExist(err) {
+		log.Printf("Error creating symlink from %s to %s: %v", path, f.dir, err)
+	}
+}
+
 type remoteLog struct {
 	fifoDir string
 }
@@ -164,6 +175,11 @@ func (r *remoteLog) Dump(n string) {
 	}
 }
 
+// Symlinks to the log directory. This is a no-op because there is no log directory.
+func (r *remoteLog) Symlink(path string) {
+	return
+}
+
 func sendToLogger(name string, fd int) error {
 	var ctlSocket int
 	var err error

pkg/init/cmd/service/runc.go

@@ -87,7 +87,7 @@ func runcInit(rootPath, serviceType string) int {
 		}
 		defer stdout.Close()
 
-		stderrLog := serviceType + "." + name + ".err"
+		stderrLog := serviceType + "." + name
 		stderr, err := logger.Open(stderrLog)
 		if err != nil {
 			log.Printf("Error opening stderr log connection: %v", err)
@@ -160,11 +160,7 @@ func runcInit(rootPath, serviceType string) int {
 	_ = os.RemoveAll(tmpdir)
 
 	// make sure the link exists from /var/log/onboot -> /run/log/onboot
-	if err := os.MkdirAll(varLogDir, 0755); err != nil {
+	logger.Symlink(varLogLink)
-		log.Printf("Error creating secondary log directory %s: %v", varLogDir, err)
-	} else if err := os.Symlink(logDir, varLogLink); err != nil && !os.IsExist(err) {
-		log.Printf("Error creating symlink from %s to %s: %v", varLogLink, logDir, err)
-	}
 
 	return status
 }

pkg/kmsg/main.go

@@ -5,6 +5,7 @@ package main
 import (
 	"fmt"
 	"log"
+	"os"
 	"time"
 
 	"github.com/euank/go-kmsg-parser/kmsgparser"
@@ -20,6 +21,6 @@ func main() {
 	kmsg := parser.Parse()
 
 	for msg := range kmsg {
-		fmt.Printf("(%d) - %s: %s", msg.SequenceNumber, msg.Timestamp.Format(time.RFC3339Nano), msg.Message)
+		fmt.Fprintf(os.Stderr, "(%d) - %s: %s", msg.SequenceNumber, msg.Timestamp.Format(time.RFC3339Nano), msg.Message)
 	}
 }

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:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
 onboot:
   - name: sysctl
     image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c

projects/compose/compose-dynamic.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

projects/compose/compose-static.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

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:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

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:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - 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-17e2eee03ab59f8df8a9c10ace003a84aec2f540"
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
 onboot:

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:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

projects/miragesdk/examples/mirage-dhcp.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
 onboot:

projects/okernel/examples/okernel_simple.yaml

@@ -2,7 +2,7 @@ kernel:
   image: okernel:latest
   cmdline: "console=tty0 page_poison=1"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

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:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

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

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: dhcpcd

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

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: poweroff

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

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: poweroff

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

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: poweroff

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

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: poweroff

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

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: poweroff

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

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: poweroff

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

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: poweroff

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

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: poweroff

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

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: poweroff

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

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: poweroff

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

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
 services:

test/cases/020_kernel/000_config_4.4.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.139
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: check-kernel-config

test/cases/020_kernel/001_config_4.9.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.9.111
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: check-kernel-config

test/cases/020_kernel/006_config_4.14.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: check-kernel-config

test/cases/020_kernel/009_config_4.17.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.17.5
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: check-kernel-config

test/cases/020_kernel/010_kmod_4.4.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.4.139
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: check

test/cases/020_kernel/011_kmod_4.9.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.9.111
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: check

test/cases/020_kernel/016_kmod_4.14.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: check

test/cases/020_kernel/019_kmod_4.17.x/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.17.5
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: check

test/cases/020_kernel/110_namespace/common.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 trust:
   org:

test/cases/030_security/000_docker-bench/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

test/cases/030_security/010_ports/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 page_poison=1"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: test

test/cases/040_packages/002_binfmt/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: binfmt

test/cases/040_packages/003_ca-certificates/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/ca-certificates:v0.5
 onboot:

test/cases/040_packages/003_containerd/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

test/cases/040_packages/004_dhcpcd/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: dhcpcd

test/cases/040_packages/005_extend/000_ext4/test-create.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: format

test/cases/040_packages/005_extend/000_ext4/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: extend

test/cases/040_packages/005_extend/001_btrfs/test-create.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: modprobe

test/cases/040_packages/005_extend/001_btrfs/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: modprobe

test/cases/040_packages/005_extend/002_xfs/test-create.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: format

test/cases/040_packages/005_extend/002_xfs/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: extend

test/cases/040_packages/006_format_mount/000_auto/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: format

test/cases/040_packages/006_format_mount/001_by_label/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: format

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:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: format

test/cases/040_packages/006_format_mount/003_btrfs/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: modprobe

test/cases/040_packages/006_format_mount/004_xfs/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: format

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:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: format

test/cases/040_packages/006_format_mount/010_multiple/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: format

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:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

test/cases/040_packages/013_mkimage/mkimage.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: mkimage

test/cases/040_packages/013_mkimage/run.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: poweroff

test/cases/040_packages/019_sysctl/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: sysctl

test/cases/040_packages/023_wireguard/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

test/cases/040_packages/030_logwrite/test.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5

test/cases/040_packages/031_kmsg/check.sh

@@ -2,7 +2,7 @@
 
 for i in $(seq 1 20); do
 	# Look for a common kernel log message
-	if grep "SCSI subsystem initialized" /var/log/kmsg.out.log 2>/dev/null; then
+	if grep "SCSI subsystem initialized" /var/log/kmsg.log 2>/dev/null; then
 		printf "kmsg test suite PASSED\n" > /dev/console
 		/sbin/poweroff -f
 	fi
@@ -10,6 +10,6 @@ for i in $(seq 1 20); do
 done
 
 printf "kmsg test suite FAILED\n" > /dev/console
-echo "contents of /var/log/kmsg.out.log:" > /dev/console
+echo "contents of /var/log/kmsg.log:" > /dev/console
-cat /var/log/kmsg.out.log > /dev/console
+cat /var/log/kmsg.log > /dev/console
 /sbin/poweroff -f

test/cases/040_packages/031_kmsg/test.yml

@@ -2,14 +2,14 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
   - linuxkit/ca-certificates:v0.5
   - linuxkit/memlogd:v0.5
 services:
   - name: kmsg
-    image: linuxkit/kmsg:v0.5
+    image: linuxkit/kmsg:cf3dc833591838596427aac032c829ea592599d0
   - name: write-and-rotate-logs
     image: linuxkit/logwrite:d9778c0d538094d398cf0cbfc89277aeca67f1be
   - name: check-the-logs

test/hack/test-ltp.yml

@@ -2,7 +2,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
 onboot:

test/hack/test.yml

@@ -4,7 +4,7 @@ kernel:
   image: linuxkit/kernel:4.14.54
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
   - linuxkit/containerd:v0.5
 onboot:

test/pkg/ns/template.yml

@@ -3,7 +3,7 @@ kernel:
   image: linuxkit/kernel:4.9.38
   cmdline: "console=ttyS0"
 init:
-  - linuxkit/init:v0.5
+  - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f
   - linuxkit/runc:v0.5
 onboot:
   - name: test-ns