From 16604bc039835e2c607ef8480dba9199f70f53a8 Mon Sep 17 00:00:00 2001 From: Krister Johansen Date: Mon, 11 Jun 2018 08:29:08 -0700 Subject: [PATCH 1/2] Reboot should reboot instead of powering off. When busybox's reboot processing occurs in init, it runs all SHUTDOWN actions that are defined in inittab. Once those are complete, it will trigger either a halt, poweroff, or reboot, depending upon what signal is received. The mechanism that's used to shell out through inittab does not allow us to pass through exactly which invocation was requested. Due to the way that rc.shutdown works, it invokes the poweroff action for any and all SHUTDOWN callbacks, whether they're a reboot, poweroff, or halt. Instead of handling the reboot(2) syscall in rc.shutdown, return after killing and unmounting and let busybox's init process decide which reboot(2) action to use. Signed-off-by: Krister Johansen --- pkg/init/etc/inittab | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/init/etc/inittab b/pkg/init/etc/inittab index 1c4e4bfb4..5957ee059 100644 --- a/pkg/init/etc/inittab +++ b/pkg/init/etc/inittab @@ -6,4 +6,9 @@ ::ctrlaltdel:/bin/rc.shutdown reboot # Stuff to do on shutdown -::shutdown:/bin/rc.shutdown poweroff +# +# Use 'noop' so that rc.shutdown does not attempt to invoke its own shutdown +# actions. Instead, it will return after it invokes sync/umount. This lets +# init decide which shutdown action to run. (So that it's possible to correctly +# handle halt, reboot, or poweroff) +::shutdown:/bin/rc.shutdown noop From 45222dfaaf16718ac60fb397e2ea50dcf4107a7d Mon Sep 17 00:00:00 2001 From: Krister Johansen Date: Mon, 11 Jun 2018 08:29:20 -0700 Subject: [PATCH 2/2] Move init image to fbcbbe3ace0b3e9455300017dd07625293a0d4d4. This attempts to work around a CI issue where we're running out of disk space when rebuilding the init package. Signed-off-by: Krister Johansen --- contrib/crosvm/README.md | 2 +- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/cadvisor.yml | 2 +- examples/docker-for-mac.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/hostmount-writeable-overlay.yml | 2 +- examples/influxdb-os.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/openstack.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/rt-for-vmware.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/tpm.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd-containerd.yml | 2 +- examples/vultr.yml | 2 +- examples/wireguard.yml | 2 +- linuxkit.yml | 2 +- projects/clear-containers/clear-containers.yml | 2 +- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- projects/ima-namespace/ima-namespace.yml | 2 +- projects/landlock/landlock.yml | 2 +- projects/logging/examples/logging.yml | 2 +- projects/memorizer/memorizer.yml | 2 +- projects/miragesdk/examples/fdd.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/okernel/examples/okernel_simple.yaml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- test/cases/000_build/000_formats/test.yml | 2 +- .../cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/000_qemu/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/050_run_aws/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- .../010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 2 +- test/cases/020_kernel/000_config_4.4.x/test.yml | 2 +- test/cases/020_kernel/001_config_4.9.x/test.yml | 2 +- test/cases/020_kernel/006_config_4.14.x/test.yml | 2 +- test/cases/020_kernel/008_config_4.16.x/test.yml | 2 +- test/cases/020_kernel/010_kmod_4.4.x/test.yml | 2 +- test/cases/020_kernel/011_kmod_4.9.x/test.yml | 2 +- test/cases/020_kernel/016_kmod_4.14.x/test.yml | 2 +- test/cases/020_kernel/018_kmod_4.16.x/test.yml | 2 +- test/cases/020_kernel/110_namespace/common.yml | 2 +- test/cases/030_security/000_docker-bench/test.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 2 +- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- test/cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../cases/040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../040_packages/006_format_mount/005_by_device_force/test.yml | 2 +- test/cases/040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/007_getty-containerd/test.yml | 2 +- test/cases/040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test.yml | 2 +- test/cases/040_packages/023_wireguard/test.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- test/pkg/ns/template.yml | 2 +- 84 files changed, 84 insertions(+), 84 deletions(-) diff --git a/contrib/crosvm/README.md b/contrib/crosvm/README.md index 031463f3e..33450afcf 100644 --- a/contrib/crosvm/README.md +++ b/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:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f services: diff --git a/examples/aws.yml b/examples/aws.yml index 7c8f122d9..e3795ef74 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/azure.yml b/examples/azure.yml index 3aaa9a3f1..4ab7e3f7d 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index f8bcb7362..26f52acd4 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 29387ecac..0ec23a162 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:v0.4 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/docker.yml b/examples/docker.yml index 14d5cb371..05aa6c54c 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/gcp.yml b/examples/gcp.yml index 74e6b5881..83df90bdf 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/getty.yml b/examples/getty.yml index 94b118b9b..f867eae08 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index a0351c9c4..951d76a74 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 372f9b071..1e9befd9a 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/minimal.yml b/examples/minimal.yml index 371c99b9e..08900dd03 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 0c641a95c..0f64f3196 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f services: diff --git a/examples/openstack.yml b/examples/openstack.yml index 8198c2551..933d3d0fa 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/packet.yml b/examples/packet.yml index 52adeb21d..c7fc6462f 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index c349c8a5e..62bbd2c7d 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index ebbf1743c..203b366e7 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.40-rt cmdline: "console=tty0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/sshd.yml b/examples/sshd.yml index 27533a65b..72656d9d1 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/swap.yml b/examples/swap.yml index 2e07bf56a..cf9cf98a9 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/tpm.yml b/examples/tpm.yml index b7bd9ff36..913761abf 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/vmware.yml b/examples/vmware.yml index 320d63a5f..a923f42ba 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 9c623923d..323e58fc3 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 32d78c048..ab6ffb1e5 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/examples/vultr.yml b/examples/vultr.yml index 74e6b5881..83df90bdf 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index de0df7728..06aa15e4e 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/linuxkit.yml b/linuxkit.yml index 733852796..7a44e459b 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index c8ce3d3b7..3d547be6a 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:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index fe24f77ce..6d4462aaa 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 6947f7fed..e95503e54 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index a580c35d0..c822dbace 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:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 803dad30c..ad55fb8b4 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:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 09ecac846..4911a098d 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 5a9f705ca..6a2a54eda 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg-17e2eee03ab59f8df8a9c10ace003a84aec2f540" cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 2217733db..b0bf07cc4 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index d51ec2ea3..6d39dbf56 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 14cea4504..234bddd1a 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:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 42211170f..ac7d166f3 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:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 757f197ab..ec6e3516a 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:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: dhcpcd 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 eef61663a..1d3c8d1a6 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 eef61663a..1d3c8d1a6 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 3631bdf14..f89d4b4fd 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:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 a4ba2dd60..59c76eb6e 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:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 a4ba2dd60..59c76eb6e 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:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 a4ba2dd60..59c76eb6e 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:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 a4ba2dd60..59c76eb6e 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:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 981160696..2966e4b74 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:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 a4ba2dd60..59c76eb6e 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:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 a4ba2dd60..59c76eb6e 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:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 1dce5fadd..6a98af6b1 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:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f services: diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index 5109547c8..ccfb74479 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.136 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index c6ce9857a..32b95af98 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.107 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/006_config_4.14.x/test.yml b/test/cases/020_kernel/006_config_4.14.x/test.yml index d77e12a49..ce1e3f82e 100644 --- a/test/cases/020_kernel/006_config_4.14.x/test.yml +++ b/test/cases/020_kernel/006_config_4.14.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/008_config_4.16.x/test.yml b/test/cases/020_kernel/008_config_4.16.x/test.yml index 1cd6eeb16..302458e96 100644 --- a/test/cases/020_kernel/008_config_4.16.x/test.yml +++ b/test/cases/020_kernel/008_config_4.16.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.16.14 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/010_kmod_4.4.x/test.yml b/test/cases/020_kernel/010_kmod_4.4.x/test.yml index 99c3b1563..5d5354fec 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.136 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: check diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index 5d75ff4bc..14aaf0837 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.107 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: check diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.yml b/test/cases/020_kernel/016_kmod_4.14.x/test.yml index 12dcd91ed..a9c265e32 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: check diff --git a/test/cases/020_kernel/018_kmod_4.16.x/test.yml b/test/cases/020_kernel/018_kmod_4.16.x/test.yml index f6b983cc0..df6979e5c 100644 --- a/test/cases/020_kernel/018_kmod_4.16.x/test.yml +++ b/test/cases/020_kernel/018_kmod_4.16.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.16.14 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: check diff --git a/test/cases/020_kernel/110_namespace/common.yml b/test/cases/020_kernel/110_namespace/common.yml index 488ca6edf..335a0ab29 100644 --- a/test/cases/020_kernel/110_namespace/common.yml +++ b/test/cases/020_kernel/110_namespace/common.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 trust: org: diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 70484428d..bdb938ee0 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:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 0b1e6b4f5..c30bf1b2a 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:4.14.48 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: test diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 218ecb2e1..48c73ecaa 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: binfmt diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 652a356cc..fd0910f25 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/ca-certificates:v0.4 onboot: diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 56fd1b22f..3aa74542f 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 6faccb5f1..1d1d8b1c2 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: dhcpcd 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 5b18a5a20..edd664c17 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 7b501917c..260e4c11e 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 d22be5e3c..55672132e 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 9fc1ba46a..d7b971cf4 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 b91ae139c..06124f5a5 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 d30633086..70410d73a 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 03dfcaf5e..d958cab18 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 79a3398cc..5adf45bb3 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 60c2985e6..2ae3b941b 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:4.9.38 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 c712283c1..fbac836b1 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 e84447254..c6a8d4182 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 4de7658fc..b9e31f944 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:4.9.51 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 bac1a0909..25e8136de 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 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 9d6385b38..849fa7fe4 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:4.9.x cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 4cbbfd1d3..d13253534 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index f54987346..0a6e7a8a9 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 8c5abeeaf..42b851661 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 47e1f123d..10523a1f6 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:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 720a3525e..a84b51e2f 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index 4078b20f6..8d5f60643 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 38c376e6a..8918f786b 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=ttyS0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 - linuxkit/runc:v0.4 onboot: - name: test-ns