[prev in list] [next in list] [prev in thread] [next in thread] 

List:       annvix-cvs
Subject:    [cvs] CVS commit in packages/smartmontools on 2005/09/29 01:18:03
From:       cvsrep () annvix ! org
Date:       2005-09-29 1:18:04
Message-ID: E1EKn3k-0003wE-B3 () build ! annvix ! org
[Download RAW message or body]

Module name:   packages/smartmontools
Changes by:    vdanen
Date:          2005/09/29 01:18:03

Commit log:
- execline runscript
- created env directory
- drop the sysconfig file

Index: smartd.run
===================================================================
RCS file: /work/annvix/cvsroot/packages/smartmontools/smartd.run,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- smartd.run	29 Mar 2005 03:50:25 -0000	1.3
+++ smartd.run	29 Sep 2005 01:18:03 -0000	1.3.4.1
@@ -1,12 +1,11 @@
-#!/bin/sh
-PATH="/sbin:/usr/sbin:/bin:/usr/bin"
+#!/bin/execlineb
 
-# this runs smartd supervised
+/bin/fdmove -c 2 1
 
-if [ -f /etc/sysconfig/smartd ]; then
-  . /etc/sysconfig/smartd
-else
-  INTERVAL="1800"
-fi
+/bin/export PATH "/sbin:/usr/sbin:/bin:/usr/bin"
 
-exec /usr/sbin/smartd -d -i $INTERVAL 2>&1
+/sbin/chpst -e ./env/
+
+import -D "1800" INTERVAL
+
+/usr/sbin/smartd -d -i ${INTERVAL}

Index: smartmontools.spec
===================================================================
RCS file: /work/annvix/cvsroot/packages/smartmontools/smartmontools.spec,v
retrieving revision 1.3.4.5
retrieving revision 1.3.4.6
diff -u -r1.3.4.5 -r1.3.4.6
--- smartmontools.spec	4 Sep 2005 00:34:25 -0000	1.3.4.5
+++ smartmontools.spec	29 Sep 2005 01:18:03 -0000	1.3.4.6
@@ -9,7 +9,7 @@
 
 %define name		smartmontools
 %define version 	5.33
-%define release 	6avx
+%define release 	7avx
 
 Summary:	SMARTmontools - for monitoring S.M.A.R.T. disks and devices
 Name:           %{name}
@@ -63,8 +63,8 @@
 install -m 0740 %{SOURCE2} %{buildroot}%{_srvdir}/smartd/log/run
 rm -rf %{buildroot}%{_initrddir}
 
-mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
-echo "INTERVAL=1800" > %{buildroot}%{_sysconfdir}/sysconfig/smartd
+mkdir -p %{buildroot}%{_srvdir}/smartd/env
+echo "1800" > %{buildroot}%{_srvdir}/smartd/env/INTERVAL
 
 
 %clean
@@ -85,7 +85,6 @@
 %defattr(-,root,root)
 %doc %{_docdir}/%{name}-%{version}
 %config(noreplace) %{_sysconfdir}/smartd.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/smartd
 %{_sbindir}/smartd
 %{_sbindir}/smartctl
 %{_mandir}/man5/smartd.conf.5*
@@ -93,11 +92,18 @@
 %{_mandir}/man8/smartctl.8*
 %dir %attr(0750,root,admin) %{_srvdir}/smartd
 %dir %attr(0750,root,admin) %{_srvdir}/smartd/log
+%dir %attr(0750,root,admin) %{_srvdir}/smartd/env
 %config(noreplace) %attr(0740,root,admin) %{_srvdir}/smartd/run
 %config(noreplace) %attr(0740,root,admin) %{_srvdir}/smartd/log/run
+%config(noreplace) %attr(0740,root,admin) %{_srvdir}/smartd/env/INTERVAL
 
 
 %changelog
+* Tue Sep 27 2005 Vincent Danen <vdanen@annvix.org> 5.33-7avx
+- execline runscript
+- created env directory
+- drop the sysconfig file
+
 * Sat Sep 03 2005 Vincent Danen <vdanen@annvix.org> 5.33-6avx
 - s/supervise/service/ in log/run
 


_______________________________________________
cvs mailing list
cvs@annvix.org
http://annvix.org/mailman/listinfo/cvs

[prev in list] [next in list] [prev in thread] [next in thread]