From 34e0e3ed54dbba2525d51e5d5f87cf74f04141a2 Mon Sep 17 00:00:00 2001 From: Xiao Ni Date: Wed, 1 Apr 2020 09:58:30 +0800 Subject: [PATCH] Fix raid-check config errors It shouldn't enable raid-check.service at boot. And remove mdmonitor-takeover.service. Signed-off-by: Xiao Ni --- mdadm.spec | 15 ++++++--------- raid-check.service | 3 --- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/mdadm.spec b/mdadm.spec index 9bc4443..29c2345 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Name: mdadm Version: 4.1 #define subversion rc2 -Release: 4%{?subversion:.%{subversion}}%{?dist} +Release: 5%{?subversion:.%{subversion}}%{?dist} Summary: The mdadm program controls Linux md devices (software RAID arrays) URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPLv2+ @@ -66,14 +66,7 @@ mkdir -p %{buildroot}/etc/libreport/events.d install -m644 %{SOURCE6} %{buildroot}/etc/libreport/events.d %post -%systemd_post mdmonitor.service raid-check.{service,timer} -%{_bindir}/systemctl disable mdmonitor-takeover.service >/dev/null 2>&1 || : - -# If there is any cron daemon configured, enable the systemd timer to avoid -# breaking the configuration silently when upgrading from 4.1-rc2.0.2 or -# earlier versions -%triggerin -- mdadm < 4.1-rc2.0.2 -[ -e %{_sysconfdir}/crontab -o -e %{_sysconfdir}/anacrontab -o -e %{_sysconfdir}/fcrontab ] && %{_bindir}/systemctl enable raid-check.timer &>/dev/null || : +%systemd_post mdmonitor.service raid-check.timer %preun %systemd_preun mdmonitor.service raid-check.timer @@ -95,6 +88,10 @@ install -m644 %{SOURCE6} %{buildroot}/etc/libreport/events.d /etc/libreport/events.d/* %changelog +* Wed Apr 01 2020 Xiao Ni - 4.1-5 +- Fix raid check systemd config errors +- Resolves bz1801010 + * Sun Mar 08 2020 Peter Robinson - 4.1-4 - Fix install location of udev rules (rhbz 1809117) diff --git a/raid-check.service b/raid-check.service index e17067c..f8ed5ac 100644 --- a/raid-check.service +++ b/raid-check.service @@ -4,6 +4,3 @@ Description=RAID setup health check [Service] Type=oneshot ExecStart=/usr/sbin/raid-check - -[Install] -WantedBy=multi-user.target