* Sun Jan 9 2011 Tomasz Torcz <ttorcz@fedoraproject.org> 20090401-6.fc14.2

- remove bad parentheses in ExecStart= line of systemd unit def
  (thanks Alexandre Silva Lopes, #667073)

hdapsd.event

@@ -1,13 +1,13 @@
 # hdapsd starting script
 # laptops seldom have >2 HDD, so we care only about first two
 
-start on block-device-added sd[ab][!0-9]
+start on block-device-added sd[ab]
 instance
 nice -5
 
 script
 	. /etc/sysconfig/hdapsd
 
-	/usr/sbin//hdapsd -b -l -d $1 $HDAPSD_OPTIONS
+	/usr/sbin/hdapsd -b -l -d $1 $HDAPSD_OPTIONS
 end script
 

hdapsd.spec

@@ -1,6 +1,6 @@
 Name:		hdapsd	
 Version:	20090401
-Release:	6%{?dist}
+Release:	6%{?dist}.2
 Summary:	Protects hard drives by parking head when fall is detected
 
 Group:		Applications/System
@@ -11,8 +11,13 @@ Source1:	hdapsd.event.upstart0.6
 Source2:	hdapsd.sysconfig
 Source3:	99-hdapsd.rules.systemd
 Source4:	hdapsd@.service
+Source5:	hdapsd.sysvinit
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: 	systemd-units
+Requires(post):	chkconfig
+Requires(preun):	chkconfig
+# This is for /sbin/service
+Requires(preun):	initscripts
 
 %description
 
@@ -37,10 +42,12 @@ mkdir -p %{buildroot}%{_sysconfdir}/init/
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/
 mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d/
 mkdir -p %{buildroot}/lib/systemd/system/
+mkdir -p %{buildroot}%{_initddir}
 cp -p %SOURCE1 %{buildroot}%{_sysconfdir}/init/hdapsd.conf
 cp -p %SOURCE2 %{buildroot}%{_sysconfdir}/sysconfig/hdapsd
 cp -p %SOURCE3 %{buildroot}%{_sysconfdir}/udev/rules.d/99-hdapsd.rules
 cp -p %SOURCE4 %{buildroot}/lib/systemd/system/
+cp -p %SOURCE5 %{buildroot}%{_initddir}/hdapsd
 # remove docs installed by "make install", will be installed in proper dir by %doc
 rm -rf %{buildroot}%{_defaultdocdir}/%{name}
 
@@ -48,6 +55,15 @@ rm -rf %{buildroot}%{_defaultdocdir}/%{name}
 %clean
 rm -rf %{buildroot}
 
+%post
+# This adds the proper /etc/rc*.d links for the script
+/sbin/chkconfig --add hdapsd
+
+%preun
+if [ $1 = 0 ] ; then
+    /sbin/service hdapsd stop >/dev/null 2>&1
+    /sbin/chkconfig --del hdapsd
+fi
 
 %files
 %defattr(-,root,root,-)
@@ -57,6 +73,7 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/sysconfig/hdapsd
 /lib/systemd/system/hdapsd@.service
 %{_mandir}/man8/hdapsd.8.gz
+%{_initddir}/hdapsd
 %doc AUTHORS
 %doc COPYING
 %doc ChangeLog
@@ -64,6 +81,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Jan 9 2011 Tomasz Torcz <ttorcz@fedoraproject.org> 20090401-6.fc14.2
+- remove bad parentheses in ExecStart= line of systemd unit def
+  (thanks Alexandre Silva Lopes, #667073)
+
+* Wed Dec 15 2010 Tomasz Torcz <ttorcz@fedoraproject.org> 20090401-6.fc14.1
+- give up fighting with upstart rules and ship legacy  
+  Sysv init script provided by Matthias Haase;
+  (i can haz systemd, where this activation works reliably?)
+
 * Sat Jul 17 2010 Tomasz Torcz <ttorcz@fedoraproject.org> 20090401-6
 - provide systemd service definition
 - resurrect udev rule for systemd interaction

hdapsd.sysvinit

@@ -0,0 +1,59 @@
+#!/bin/sh
+#
+# hdapsd - disk protection user-space daemon
+#
+# chkconfig: - 11 91
+# description: disk protection user-space daemon
+#
+# executable: /usr/sbin/hdapsd
+
+# Source function library
+. /etc/init.d/functions
+
+[ -x /usr/sbin/hdapsd ] || exit 1
+
+[ -e /etc/sysconfig/hdapsd ] && . /etc/sysconfig/hdapsd
+
+RETVAL=0
+
+start(){
+	echo -n $"Starting hdaps daemon: "
+	daemon -5 /usr/sbin/hdapsd -f -l -d sda $HDAPSD_OPTIONS
+	RETVAL=$?
+	echo
+	return $RETVAL
+}
+
+stop(){
+	echo -n $"Stopping hdaps daemon: "
+	killproc hdapsd
+	RETVAL=$?
+	echo
+	return $RETVAL
+}
+
+restart(){
+	stop
+	start
+}
+
+# See how we were called.
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	restart)
+		restart
+		;;
+	status)
+		status hdapsd
+		;;
+	*)
+		echo $"Usage: $0 {start|stop|restart|status}"
+		RETVAL=1
+esac
+
+exit $RETVAL

hdapsd@.service

@@ -6,4 +6,4 @@ EnvironmentFile=/etc/sysconfig/hdapsd
 StandardOutput=syslog
 SyslogIdentifier=%p(%I)
 Nice=-5
-ExecStart=/usr/sbin/hdapsd -d %I $(HDAPSD_OPTIONS)
+ExecStart=/usr/sbin/hdapsd -d %I $HDAPSD_OPTIONS