From 3a519f746df22be95725d2e85fe1e9e6a9390dbd Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Feb 09 2011 16:09:44 +0000 Subject: - move to systemd --- diff --git a/smartd.service b/smartd.service new file mode 100644 index 0000000..f36a8e6 --- /dev/null +++ b/smartd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Self Monitoring and Reporting Technology (SMART) Daemon +After=syslog.target + +[Service] +EnvironmentFile=/etc/sysconfig/smartmontools +ExecStart=/usr/sbin/smartd -n $smartd_opts + +[Install] +WantedBy=multi-user.target diff --git a/smartmontools.spec b/smartmontools.spec index 00b402b..5d63457 100644 --- a/smartmontools.spec +++ b/smartmontools.spec @@ -1,7 +1,7 @@ Summary: Tools for monitoring SMART capable hard disks Name: smartmontools Version: 5.40 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Group: System Environment/Base License: GPLv2+ @@ -9,6 +9,7 @@ URL: http://smartmontools.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: smartd.initd Source2: smartmontools.sysconf +Source3: smartd.service #fedora/rhel specific Patch1: smartmontools-5.38-defaultconf.patch @@ -17,7 +18,11 @@ Patch1: smartmontools-5.38-defaultconf.patch Patch2: smartmontools-5.40-megaraid.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Requires: fileutils mailx chkconfig initscripts +Requires: fileutils mailx chkconfig +Requires(triggerun): systemd-units +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units BuildRequires: readline-devel ncurses-devel automake util-linux groff gettext BuildRequires: libselinux-devel libcap-ng-devel @@ -59,23 +64,39 @@ make DESTDIR=$RPM_BUILD_ROOT install #rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd.conf rm -f examplescripts/Makefile* chmod a-x -R examplescripts/* -install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd -install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmontools - +install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmontools +install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/lib/systemd/system/smartd.service +rm -rf $RPM_BUILD_ROOT/etc/{rc.d,init.d} rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %preun -if [ "$1" = "0" ] ; then - /sbin/service smartd stop >/dev/null 2>&1 ||: - /sbin/chkconfig --del smartd +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl disable smartd.service >/dev/null 2>&1 || : + /bin/systemctl stop smartd.service > /dev/null 2>&1 || : fi %post /sbin/chkconfig --add smartd /sbin/service smartd condrestart >/dev/null 2>&1 ||: +if [ $1 -eq 1 ]; then + /bin/systemctl enable smartd.service >/dev/null 2>&1 || : +fi + +%postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart smartd.service >/dev/null 2>&1 || : +fi + + +%triggerun -- smartmontools < 1:5.40-4 +[ /sbin/chkconfig smartd ] && /bin/systemctl enable smartd.service >/dev/null 2>&1 || : + %files %defattr(-,root,root,-) @@ -83,7 +104,7 @@ fi %doc TODO WARNINGS examplescripts smartd.conf %config(noreplace) %{_sysconfdir}/smartd.conf %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools -%{_initddir}/smartd +/lib/systemd/system/smartd.service %{_sbindir}/smartd %{_sbindir}/update-smart-drivedb %{_sbindir}/smartctl @@ -91,6 +112,9 @@ fi %{_datadir}/%{name}/drivedb.h %changelog +* Wed Feb 09 2011 Michal Hlavinka - 1:5.40-5 +- move to systemd + * Wed Feb 09 2011 Fedora Release Engineering - 1:5.40-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild