From 4362818c0c3b0d24a2d1b56ddd49798bea69b4d8 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 19 May 2022 13:35:12 -0700 Subject: [PATCH] fix skipping starting cri service with force systemd --- pkg/minikube/cruntime/docker.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index 116305643f..ca82f87a71 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -121,7 +121,6 @@ func (r *Docker) Enable(disOthers, forceSystemd, inUserNamespace bool) error { if inUserNamespace { return errors.New("inUserNamespace must not be true for docker") } - containerdWasActive := r.Init.Active("containerd") if disOthers { if err := disableOthers(r, r.Runner); err != nil { @@ -145,15 +144,9 @@ func (r *Docker) Enable(disOthers, forceSystemd, inUserNamespace bool) error { if err := r.forceSystemd(); err != nil { return err } - return r.Init.Restart("docker") } - if containerdWasActive && !dockerBoundToContainerd(r.Runner) { - // Make sure to use the internal containerd - return r.Init.Restart("docker") - } - - if err := r.Init.Start("docker"); err != nil { + if err := r.Init.Restart("docker"); err != nil { return err }