From b60ca3861380dc438e1a725e9bc0a17433db61cf Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Tue, 22 Sep 2026 10:09:17 +0200 Subject: [PATCH 1/2] Fix warnings on uninstall When uninstall is called twice, it tries to disable services that have been already removed. Do it conditionally to avoid systemd warnings. Signed-off-by: Robert Baldyga --- utils/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/utils/Makefile b/utils/Makefile index f9957b9bd..9059183a0 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -96,8 +96,12 @@ uninstall: $(call remove-file,$(DESTDIR)$(UDEVRULES_DIR)/60-persistent-storage-cas.rules) @$(UDEV) control --reload-rules - @$(SYSTEMCTL) -q disable open-cas-shutdown - @$(SYSTEMCTL) -q disable open-cas + @if [ -f $(DESTDIR)$(SYSTEMD_DIR)/open-cas-shutdown.service ]; then \ + $(SYSTEMCTL) -q disable open-cas-shutdown; \ + fi + @if [ -f $(DESTDIR)$(SYSTEMD_DIR)/open-cas.service ]; then \ + $(SYSTEMCTL) -q disable open-cas; \ + fi @$(SYSTEMCTL) daemon-reload $(call remove-file,$(DESTDIR)$(SYSTEMD_DIR)/open-cas-shutdown.service) From 671f12e43266263ed990b941131c7e42235248eb Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Tue, 22 Sep 2026 10:12:32 +0200 Subject: [PATCH 2/2] Uninstall experimental features conditionally Those are disabled by default, so attempting to uninstall them on a regular build causes unnecessary warnings. Signed-off-by: Robert Baldyga --- extra/prometheus/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/extra/prometheus/Makefile b/extra/prometheus/Makefile index 80efad1d5..940157c0a 100644 --- a/extra/prometheus/Makefile +++ b/extra/prometheus/Makefile @@ -40,10 +40,13 @@ ifdef EXPORTER endif uninstall: - -$(SYSTEMCTL) disable --now opencas_exporter - rm -f $(DESTDIR)/usr/bin/opencas_exporter - rm -f $(DESTDIR)$(SYSTEMD_DIR)/opencas_exporter.service - $(SYSTEMCTL) daemon-reload + @if [ -f $(DESTDIR)$(SYSTEMD_DIR)/opencas_exporter.service ]; then \ + echo "Uninstalling Open-CAS Prometheus exporter"; \ + $(SYSTEMCTL) disable --now opencas_exporter; \ + rm -f $(DESTDIR)$(SYSTEMD_DIR)/opencas_exporter.service; \ + $(SYSTEMCTL) daemon-reload; \ + fi + @rm -f $(DESTDIR)/usr/bin/opencas_exporter clean: rm -f opencas_exporter