[packages/mdadm] mask mdadm.service, activate mdmonitor.service instead

jajcus jajcus at pld-linux.org
Fri Oct 6 11:21:19 CEST 2017


commit 555514b379df5f03c9ad8b03c436da8b10753108
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Fri Oct 6 11:02:41 2017 +0200

    mask mdadm.service, activate mdmonitor.service instead
    
    Not to run the init.d script under systemd.
    
    Note: systemd_trigger is not needed, as mdmonitor.service does not need
    to be 'enabled', it is normally started from udev rules.

 mdadm.spec | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/mdadm.spec b/mdadm.spec
index 5d5a2b7..23ddbb0 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -8,7 +8,7 @@ Summary:	Tool for creating and maintaining software RAID devices
 Summary(pl.UTF-8):	Narzędzie do tworzenia i obsługi programowych macierzy RAID
 Name:		mdadm
 Version:	4.0
-Release:	4
+Release:	5
 License:	GPL v2+
 Group:		Base
 Source0:	https://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.xz
@@ -147,28 +147,27 @@ install -p %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/mdadm-checkarray
 install -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}/cronjob-mdadm.timer
 install -p %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}/cronjob-mdadm.service
 
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/mdadm.service
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add %{name}
 %service mdadm restart "RAID monitoring"
-%systemd_post mdadm.service cronjob-mdadm.timer
+%systemd_post mdmonitor.service cronjob-mdadm.timer
 
 %preun
 if [ "$1" = "0" ]; then
 	%service mdadm stop
 	/sbin/chkconfig --del mdadm
 fi
-%systemd_preun mdadm.service cronjob-mdadm.timer
+%systemd_preun mdmonitor.service cronjob-mdadm.timer
 
 %postun
 /sbin/ldconfig
 %systemd_reload
 
-%triggerpostun -- %{name} < 4.0-2
-%systemd_trigger mdadm.service
-
 %triggerpostun -- %{name} < 4.0-3
 %systemd_service_enable cronjob-mdadm.timer
 
@@ -184,6 +183,7 @@ fi
 %{systemdunitdir}/mdadm-grow-continue at .service
 %{systemdunitdir}/mdadm-last-resort at .service
 %{systemdunitdir}/mdadm-last-resort at .timer
+%{systemdunitdir}/mdadm.service
 %{systemdunitdir}/mdmon at .service
 %{systemdunitdir}/mdmonitor.service
 %{systemdunitdir}/cronjob-mdadm.service
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mdadm.git/commitdiff/555514b379df5f03c9ad8b03c436da8b10753108



More information about the pld-cvs-commit mailing list