From 876e32eb69a4ccbb0764570cd556c315fe51e86d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sun, 24 Nov 2019 20:59:29 +0100
Subject: [PATCH] Include the crio-wipe.service with crio

---
 .../minikube-iso/package/crio-bin/crio-bin.mk  |  3 +++
 .../package/crio-bin/crio-wipe.service         | 18 ++++++++++++++++++
 .../minikube-iso/package/crio-bin/crio.service |  7 +++++--
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 deploy/iso/minikube-iso/package/crio-bin/crio-wipe.service

diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
index d40fc62093..1447c603bc 100644
--- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
+++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
@@ -64,6 +64,9 @@ define CRIO_BIN_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -Dm644 \
 		$(CRIO_BIN_PKGDIR)/crio.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/crio.service
+	$(INSTALL) -Dm644 \
+		$(CRIO_BIN_PKGDIR)/crio-wipe.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/crio-wipe.service
 	$(call link-service,crio.service)
 	$(call link-service,crio-shutdown.service)
 endef
diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-wipe.service b/deploy/iso/minikube-iso/package/crio-bin/crio-wipe.service
new file mode 100644
index 0000000000..e962cecc3a
--- /dev/null
+++ b/deploy/iso/minikube-iso/package/crio-bin/crio-wipe.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=CRI-O Auto Update Script
+Before=crio.service
+RequiresMountsFor=/var/lib/containers
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/crio
+EnvironmentFile=-/etc/sysconfig/crio.minikube
+EnvironmentFile=/var/run/minikube/env
+ExecStart=/usr/bin/crio \
+          $CRIO_OPTIONS \
+          $CRIO_MINIKUBE_OPTIONS \
+		  wipe
+
+Type=oneshot
+
+[Install]
+WantedBy=multi-user.target
diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio.service b/deploy/iso/minikube-iso/package/crio-bin/crio.service
index 3691e8de4e..30a794e597 100644
--- a/deploy/iso/minikube-iso/package/crio-bin/crio.service
+++ b/deploy/iso/minikube-iso/package/crio-bin/crio.service
@@ -1,8 +1,11 @@
 [Unit]
-Description=Open Container Initiative Daemon
-Documentation=https://github.com/kubernetes-sigs/cri-o
+Description=Container Runtime Interface for OCI (CRI-O)
+Documentation=https://github.com/cri-o/cri-o
+Wants=network-online.target
 After=network-online.target minikube-automount.service
 Requires=minikube-automount.service
+After=crio-wipe.service
+Requires=crio-wipe.service
 
 [Service]
 Type=notify