diff --git a/server/container_create_linux.go b/server/container_create_linux.go index 50502d59efb..4ed36d524fc 100644 --- a/server/container_create_linux.go +++ b/server/container_create_linux.go @@ -647,7 +647,7 @@ func (s *Server) createSandboxContainer(ctx context.Context, ctr ctrIface.Contai Destination: "/etc/resolv.conf", Type: "bind", Source: sb.ResolvPath(), - Options: []string{"bind", "nodev", "nosuid", "noexec"}, + Options: append(options, []string{"bind", "nodev", "nosuid", "noexec"}...), }) } diff --git a/test/ctr.bats b/test/ctr.bats index adeaafd66a5..0df68307731 100644 --- a/test/ctr.bats +++ b/test/ctr.bats @@ -731,7 +731,7 @@ function wait_until_exit() { "$TESTDATA"/container_config.json > "$newconfig" ctr_id=$(crictl create "$pod_id" "$newconfig" "$TESTDATA"/sandbox_config.json) crictl start "$ctr_id" - wait_until_exit "$ctr_id" + EXPECTED_EXIT_STATUS=1 wait_until_exit "$ctr_id" } @test "ctr create with non-existent command" {