Merge pull request #8621 from afbjorklund/containerd-disable

Disable containerd from starting up at boot
kubernetes · Jul 1, 2020 · c134ab8 · c134ab8
2 parents 8e52b6b + 11d0fcd
commit c134ab8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/50-minikube.preset b/deploy/iso/minikube-iso/package/containerd-bin/50-minikube.preset
@@ -0,0 +1 @@
+disable containerd.service
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk
@@ -48,11 +48,12 @@ define CONTAINERD_BIN_INSTALL_TARGET_CMDS
 endef
 
 define CONTAINERD_BIN_INSTALL_INIT_SYSTEMD
-	$(INSTALL) -Dm755 \
+	$(INSTALL) -Dm644 \
 		$(CONTAINERD_BIN_PKGDIR)/containerd.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/containerd.service
-	$(call link-service,containerd.service)
-	$(call link-service,containerd-shutdown.service)
+	$(INSTALL) -Dm644 \
+		$(CONTAINERD_BIN_PKGDIR)/50-minikube.preset \
+		$(TARGET_DIR)/usr/lib/systemd/system-preset/50-minikube.preset
 endef
 
 $(eval $(generic-package))