diff --git a/docs/cmdline.md b/docs/cmdline.md index 07c8ba080..d6b356285 100644 --- a/docs/cmdline.md +++ b/docs/cmdline.md @@ -11,5 +11,9 @@ within linuxkit. Unless standard Linux options exist, these all are prefaced wit | Option | Description | |---|---| -| `linuxkit.runc_debug=1` | Start runc for `onboot` and `onshutdown` containers to run with `--debug`. Also sends output to the console, in addition to the normal output to logfiles. If not present or set to 0, default to usual mode. | | `linuxkit.unified_cgroup_hierarchy=0` | Start up cgroups v1. If not present or set to 1, default to cgroups v1. | +| `linuxkit.runc_debug=1` | Start runc for `onboot` and `onshutdown` containers to run with `--debug`, and add extra logging messages for each stage of starting those containers. If not present or set to 0, default to usual mode. | +| `linuxkit.runc_console=1` | Send logs for runc for `onboot` and `onshutdown` containers, as well as the output of the containers themselves, to the console, instead of the normal output to logfiles. If not present or set to 0, default to usual mode. | + +It often is useful to combine both of the `linuxkit.runc_debug` and `linuxkit.runc_console` options to get the most +information about what is happening with `onboot` containers. diff --git a/examples/addbinds.yml b/examples/addbinds.yml index 9cb7c4c2f..3723d0516 100644 --- a/examples/addbinds.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 5c9c4ea0f..8216cd1e3 100644 --- a/examples/cadvisor.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/containerd-debug.yml b/examples/containerd-debug.yml index d4d31eeed..5344e6c6c 100644 --- a/examples/containerd-debug.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index 4aebe8604..4d1509cae 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index adfb5c5c2..5d212d4a9 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 26e89797c..04268be22 100644 --- a/examples/docker-for-mac.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/docker.yml b/examples/docker.yml index 25129d682..91f7c7068 100644 --- a/examples/docker.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/getty.yml b/examples/getty.yml index a2e98040c..c92ae50ca 100644 --- a/examples/getty.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index c28b34118..fbdf08a04 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index be569e913..3ec3926bd 100644 --- a/examples/influxdb-os.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/logging.yml b/examples/logging.yml index 7e237f548..10a51c6b9 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/minimal.yml b/examples/minimal.yml index a59deb7d5..e2f88596e 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 7e9db9247..8e6460828 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 services: diff --git a/examples/openstack.yml b/examples/openstack.yml index 51e62b606..96abd3855 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-aws.yml b/examples/platform-aws.yml index 40d764d78..983f5553d 100644 --- a/examples/platform-aws.yml +++ b/examples/platform-aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-azure.yml b/examples/platform-azure.yml index a22f34c6c..d61ef78af 100644 --- a/examples/platform-azure.yml +++ b/examples/platform-azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-equinixmetal.yml b/examples/platform-equinixmetal.yml index 88f8a4798..39aa07e20 100644 --- a/examples/platform-equinixmetal.yml +++ b/examples/platform-equinixmetal.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-gcp.yml b/examples/platform-gcp.yml index 96b494d3d..259955d00 100644 --- a/examples/platform-gcp.yml +++ b/examples/platform-gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-hetzner.yml b/examples/platform-hetzner.yml index c7d0d8743..010d74760 100644 --- a/examples/platform-hetzner.yml +++ b/examples/platform-hetzner.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-rt-for-vmware.yml b/examples/platform-rt-for-vmware.yml index fce7f3dc6..0900ec651 100644 --- a/examples/platform-rt-for-vmware.yml +++ b/examples/platform-rt-for-vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13-rt cmdline: "console=tty0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-scaleway.yml b/examples/platform-scaleway.yml index f051ca4c1..13d67f2ce 100644 --- a/examples/platform-scaleway.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-vmware.yml b/examples/platform-vmware.yml index 4f2fcd328..f7bbc41c4 100644 --- a/examples/platform-vmware.yml +++ b/examples/platform-vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-vultr.yml b/examples/platform-vultr.yml index 546cbbac4..3a69c5908 100644 --- a/examples/platform-vultr.yml +++ b/examples/platform-vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 0e5f6e061..858e531b5 100644 --- a/examples/redis-os.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/sshd.yml b/examples/sshd.yml index 21b97e94c..2f27986ff 100644 --- a/examples/sshd.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/static-ip.yml b/examples/static-ip.yml index 08c6f5a71..4882da4b0 100644 --- a/examples/static-ip.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/swap.yml b/examples/swap.yml index f1349bf70..a84290ec6 100644 --- a/examples/swap.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/tpm.yml b/examples/tpm.yml index 9fb729516..a141bb1de 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/volumes.yml b/examples/volumes.yml index a38a3d443..729f021c9 100644 --- a/examples/volumes.yml +++ b/examples/volumes.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 347dfca98..df6cb214c 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 8f6fb2480..94f574ea5 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 8da113e5d..91b1bfef2 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/linuxkit.yml b/linuxkit.yml index 005c73434..8ca93b424 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/pkg/init/cmd/service/runc.go b/pkg/init/cmd/service/runc.go index 7271e6e01..ac171fb0f 100644 --- a/pkg/init/cmd/service/runc.go +++ b/pkg/init/cmd/service/runc.go @@ -74,7 +74,7 @@ func runcInit(rootPath, serviceType string) int { log.Printf("Using %s", msg) // did we choose to run in debug mode? If so, runc will be in debug, and all messages will go to stdout/stderr in addition to the log - var runcDebugMode bool + var runcDebugMode, runcConsoleMode bool dt, err := os.ReadFile("/proc/cmdline") if err != nil { log.Fatalf("error reading /proc/cmdline: %v", err) @@ -87,7 +87,9 @@ func runcInit(rootPath, serviceType string) int { if s == "linuxkit.runc_debug=1" { runcDebugMode = true debugLogger.Level = log.DebugLevel - break + } + if s == "linuxkit.runc_console=1" { + runcConsoleMode = true } } @@ -129,12 +131,16 @@ func runcInit(rootPath, serviceType string) int { } defer stderr.Close() - if runcDebugMode { - cmd.Stdout = io.MultiWriter(stdout, os.Stdout) - cmd.Stderr = io.MultiWriter(stderr, os.Stderr) - } else { - cmd.Stdout = stdout - cmd.Stderr = stderr + cmd.Stdout = stdout + cmd.Stderr = stderr + + // if in console mode, send output to stdout/stderr instead of the log + // do not try io.MultiWriter(os.Stdout, stdout) as console messages will hang. + // it is not clear why, but since this is all for debugging anyways, it doesn't matter + // much. + if runcConsoleMode { + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr } if err := cmd.Run(); err != nil { @@ -175,7 +181,11 @@ func runcInit(rootPath, serviceType string) int { }() debugLogger.Debugf("%s %s: starting", serviceType, name) - cmd = exec.Command(runcBinary, "start", name) + cmdArgs = []string{"start", name} + if runcDebugMode { + cmdArgs = append([]string{"--debug"}, cmdArgs...) + } + cmd = exec.Command(runcBinary, cmdArgs...) cmd.Stdout = stdout cmd.Stderr = stderr diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index bc0c98818..e9d60fe49 100644 --- 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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index b7cef0f98..7ac66c5b8 100644 --- a/projects/compose/compose-dynamic.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index dcf554ad9..f5e1453e3 100644 --- a/projects/compose/compose-static.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 5f949c376..3f7b628c0 100644 --- 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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 938e5b97a..a93c80f4d 100644 --- 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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 48338e974..c79c4ac4c 100644 --- a/projects/memorizer/memorizer.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 451464a10..69e62a61e 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 5ec6db617..4e1b5b839 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index e8456aac6..715f69656 100644 --- 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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index b8bbd6ecf..faecfb677 100644 --- 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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/src/cmd/linuxkit/moby/build/mkimage.yaml b/src/cmd/linuxkit/moby/build/mkimage.yaml index 7ea79114b..3099cb097 100644 --- a/src/cmd/linuxkit/moby/build/mkimage.yaml +++ b/src/cmd/linuxkit/moby/build/mkimage.yaml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: mkimage diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 9d68ca35d..2515daa14 100644 --- 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dhcpcd diff --git a/test/cases/000_build/001_tarheaders/test.yml b/test/cases/000_build/001_tarheaders/test.yml index 6772a0cc3..7b32c3973 100644 --- a/test/cases/000_build/001_tarheaders/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index 6772a0cc3..7b32c3973 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 diff --git a/test/cases/000_build/020_binds/test.yml b/test/cases/000_build/020_binds/test.yml index 09fa51b7d..2171403c5 100644 --- a/test/cases/000_build/020_binds/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: mount diff --git a/test/cases/000_build/050_sbom/test.yml b/test/cases/000_build/050_sbom/test.yml index 462d7ce91..2abdd7255 100644 --- a/test/cases/000_build/050_sbom/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 diff --git a/test/cases/000_build/060_input_tar/000_build/test1.yml b/test/cases/000_build/060_input_tar/000_build/test1.yml index 6a21dbbf9..e235d20a5 100644 --- a/test/cases/000_build/060_input_tar/000_build/test1.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/test/cases/000_build/060_input_tar/000_build/test2.yml b/test/cases/000_build/060_input_tar/000_build/test2.yml index 18fa7b729..c4bb97a4c 100644 --- a/test/cases/000_build/060_input_tar/000_build/test2.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/000_build/060_input_tar/010_same_filename/test.yml b/test/cases/000_build/060_input_tar/010_same_filename/test.yml index 6a21dbbf9..e235d20a5 100644 --- a/test/cases/000_build/060_input_tar/010_same_filename/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/test/cases/000_build/070_volumes/000_rw_on_rw/test.yml b/test/cases/000_build/070_volumes/000_rw_on_rw/test.yml index aa8420ecb..fc74eaa33 100644 --- a/test/cases/000_build/070_volumes/000_rw_on_rw/test.yml +++ b/test/cases/000_build/070_volumes/000_rw_on_rw/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test1 diff --git a/test/cases/000_build/070_volumes/001_ro_on_ro/test.yml b/test/cases/000_build/070_volumes/001_ro_on_ro/test.yml index dc4224e1e..0a203f650 100644 --- a/test/cases/000_build/070_volumes/001_ro_on_ro/test.yml +++ b/test/cases/000_build/070_volumes/001_ro_on_ro/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/000_build/070_volumes/002_rw_on_ro/test.yml b/test/cases/000_build/070_volumes/002_rw_on_ro/test.yml index 66b208aa4..885aacc09 100644 --- a/test/cases/000_build/070_volumes/002_rw_on_ro/test.yml +++ b/test/cases/000_build/070_volumes/002_rw_on_ro/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/000_build/070_volumes/003_ro_on_rw/test.yml b/test/cases/000_build/070_volumes/003_ro_on_rw/test.yml index faeded154..9f15a6d36 100644 --- a/test/cases/000_build/070_volumes/003_ro_on_rw/test.yml +++ b/test/cases/000_build/070_volumes/003_ro_on_rw/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test1 diff --git a/test/cases/000_build/070_volumes/004_blank/test.yml b/test/cases/000_build/070_volumes/004_blank/test.yml index 9fdee759a..186e26b2c 100644 --- a/test/cases/000_build/070_volumes/004_blank/test.yml +++ b/test/cases/000_build/070_volumes/004_blank/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/000_build/070_volumes/005_image/test.yml b/test/cases/000_build/070_volumes/005_image/test.yml index be2ca1e06..1704b2118 100644 --- a/test/cases/000_build/070_volumes/005_image/test.yml +++ b/test/cases/000_build/070_volumes/005_image/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/000_build/070_volumes/006_mount_types/test.yml b/test/cases/000_build/070_volumes/006_mount_types/test.yml index 96585956a..976eb284f 100644 --- a/test/cases/000_build/070_volumes/006_mount_types/test.yml +++ b/test/cases/000_build/070_volumes/006_mount_types/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: testbinds diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index 0ebd76685..8125dc3d7 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index 0ebd76685..8125dc3d7 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 30ec6a6de..edf00f4b3 100644 --- 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 17deb71ea..eb8a58c3c 100644 --- 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git 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 index 17deb71ea..eb8a58c3c 100644 --- 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git 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 index 17deb71ea..eb8a58c3c 100644 --- 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 17deb71ea..eb8a58c3c 100644 --- 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index a079cef38..1e2705d94 100644 --- 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 17deb71ea..eb8a58c3c 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 17deb71ea..eb8a58c3c 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index 88655453c..5860cd717 100644 --- 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 services: diff --git a/test/cases/010_platforms/110_gcp/000_run/test.yml b/test/cases/010_platforms/110_gcp/000_run/test.yml index 17deb71ea..eb8a58c3c 100644 --- a/test/cases/010_platforms/110_gcp/000_run/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/020_kernel/011_config_5.4.x/test.yml b/test/cases/020_kernel/011_config_5.4.x/test.yml index c66f9612e..42b38a198 100644 --- a/test/cases/020_kernel/011_config_5.4.x/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/013_config_5.10.x/test.yml b/test/cases/020_kernel/013_config_5.10.x/test.yml index f5203256d..3ab31c51a 100644 --- a/test/cases/020_kernel/013_config_5.10.x/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/016_config_5.15.x/test.yml b/test/cases/020_kernel/016_config_5.15.x/test.yml index fca539749..111ae12c7 100644 --- a/test/cases/020_kernel/016_config_5.15.x/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/019_config_6.6.x/test.yml b/test/cases/020_kernel/019_config_6.6.x/test.yml index 830a22480..287f74053 100644 --- a/test/cases/020_kernel/019_config_6.6.x/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/111_kmod_5.4.x/test.yml b/test/cases/020_kernel/111_kmod_5.4.x/test.yml index a7c4ea699..a4f60fd32 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check diff --git a/test/cases/020_kernel/113_kmod_5.10.x/test.yml b/test/cases/020_kernel/113_kmod_5.10.x/test.yml index bbad2d1f1..d6e1932ca 100644 --- a/test/cases/020_kernel/113_kmod_5.10.x/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check diff --git a/test/cases/020_kernel/116_kmod_5.15.x/test.yml b/test/cases/020_kernel/116_kmod_5.15.x/test.yml index eb097690e..1cc6b1f3e 100644 --- a/test/cases/020_kernel/116_kmod_5.15.x/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check diff --git a/test/cases/020_kernel/119_kmod_6.6.x/test.yml b/test/cases/020_kernel/119_kmod_6.6.x/test.yml index 28de48b41..9df19c568 100644 --- a/test/cases/020_kernel/119_kmod_6.6.x/test.yml +++ b/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:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index c0e6bd323..6e38976f6 100644 --- a/test/cases/020_kernel/200_namespace/common.yml +++ b/test/cases/020_kernel/200_namespace/common.yml @@ -2,5 +2,5 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 633aabdba..9f587f0e4 100644 --- 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:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 3dc3612c6..53355a3f4 100644 --- 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:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/040_packages/001_dummy/test.yml b/test/cases/040_packages/001_dummy/test.yml index 36e368277..b1db99035 100644 --- a/test/cases/040_packages/001_dummy/test.yml +++ b/test/cases/040_packages/001_dummy/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dummy diff --git a/test/cases/040_packages/002_bcc/test.yml b/test/cases/040_packages/002_bcc/test.yml index c68beefaf..9d1064b04 100644 --- a/test/cases/040_packages/002_bcc/test.yml +++ b/test/cases/040_packages/002_bcc/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/kernel-bcc:5.4.113 onboot: diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 09f3c0162..a3ecab7c0 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: binfmt diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index b438b52d4..7a4ccfe8c 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/bpftrace:d9ddf9095bce44197aadb0119fe963cb9ebc4444 onboot: diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 34e19c1e7..021aa1c45 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: diff --git a/test/cases/040_packages/003_cgroupv2/test.yml b/test/cases/040_packages/003_cgroupv2/test.yml index 52efa4464..335892803 100644 --- a/test/cases/040_packages/003_cgroupv2/test.yml +++ b/test/cases/040_packages/003_cgroupv2/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "linuxkit.unified_cgroup_hierarchy=1 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 4f7e0d985..d4e68761b 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 89b5a3c59..18c9f6f0f 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dhcpcd diff --git a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml index f7a3c82fc..f6a204b56 100644 --- a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml +++ b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dm-crypt diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml index 664e88b48..b89eec9f9 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dm-crypt diff --git a/test/cases/040_packages/004_dm-crypt/002_key/test.yml b/test/cases/040_packages/004_dm-crypt/002_key/test.yml index 4eac57a62..c4196cbeb 100644 --- a/test/cases/040_packages/004_dm-crypt/002_key/test.yml +++ b/test/cases/040_packages/004_dm-crypt/002_key/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dm-crypt diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index ac2c037ef..a23121bdf 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index b7a58472e..a8330523a 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: extend diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index eecb888b5..e71054a54 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: modprobe diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 8887cf557..38459283e 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: modprobe diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index 61b654e2e..0d6958774 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 080c228e1..70183fdef 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: extend diff --git a/test/cases/040_packages/005_extend/003_gpt/test-create.yml b/test/cases/040_packages/005_extend/003_gpt/test-create.yml index 68f0c4d79..30ad65abb 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test-create.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/005_extend/003_gpt/test.yml b/test/cases/040_packages/005_extend/003_gpt/test.yml index b7a58472e..a8330523a 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: extend diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index e6468616e..77cd32d32 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git 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 index a2913c5f8..ea74e36ee 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git 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 index 8c140cf80..35d7228ea 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index d6eda78c1..e6fd3de3e 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: modprobe diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index e702a1ea0..2a8dc888e 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git 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 index 0b395b647..cb8d85e69 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/006_gpt/test.yml b/test/cases/040_packages/006_format_mount/006_gpt/test.yml index 2e8b4e1b3..4cd7051d2 100644 --- a/test/cases/040_packages/006_format_mount/006_gpt/test.yml +++ b/test/cases/040_packages/006_format_mount/006_gpt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index 91ea5d8ab..a3fc3f55f 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 5d0923c2b..3e89c852b 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/009_init_containerd/test.yml b/test/cases/040_packages/009_init_containerd/test.yml index bcda8dfb0..869a6ccff 100644 --- a/test/cases/040_packages/009_init_containerd/test.yml +++ b/test/cases/040_packages/009_init_containerd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/011_kmsg/test.yml b/test/cases/040_packages/011_kmsg/test.yml index f1b21e643..c24007f73 100644 --- a/test/cases/040_packages/011_kmsg/test.yml +++ b/test/cases/040_packages/011_kmsg/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/012_logwrite/test.yml b/test/cases/040_packages/012_logwrite/test.yml index cffade974..e23b59983 100644 --- a/test/cases/040_packages/012_logwrite/test.yml +++ b/test/cases/040_packages/012_logwrite/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index c015822be..adbf8e154 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: losetup diff --git a/test/cases/040_packages/013_metadata/000_cidata/test.yml b/test/cases/040_packages/013_metadata/000_cidata/test.yml index 20ba079b7..056fc2a9e 100644 --- a/test/cases/040_packages/013_metadata/000_cidata/test.yml +++ b/test/cases/040_packages/013_metadata/000_cidata/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: metadata diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index f35dd5b65..e3be3f291 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index e58de5163..37ec6be0c 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 198d75179..9b80c2431 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index a06da3a24..509336d55 100644 --- 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:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index e476ad1ab..952ae2789 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index 1554d7150..1ff55ce0b 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 9b7754fa7..0686edf0f 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:e6f99bdda1628d47f59dab20c85794b4ea6fad95 + - linuxkit/init:e120ea2a30d906bd1ee1874973d6e4b1403b5ca3 - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test-ns