From c56e02ce4b7c75d747a8fbb74330ab89cfd9d50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Mon, 26 Aug 2024 12:14:15 +0200 Subject: [PATCH] Remove crio-wipe service that is not required --- .../minikube-iso/package/crio-bin/crio-bin.mk | 3 --- .../package/crio-bin/crio-wipe.service | 20 ------------------- .../package/crio-bin/crio.service | 2 -- 3 files changed, 25 deletions(-) delete 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 be5913c061..7c03078b74 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk @@ -72,9 +72,6 @@ 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 deleted file mode 100644 index 1389fa9e29..0000000000 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-wipe.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=CRI-O Auto Update Script -Before=crio.service -After=minikube-automount.service -Requires=minikube-automount.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 30a794e597..7b279ad3a1 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio.service +++ b/deploy/iso/minikube-iso/package/crio-bin/crio.service @@ -4,8 +4,6 @@ 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