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

List:       annvix-cvs
Subject:    [cvs] CVS commit in packages/mdadm on 2005/09/28 04:40:41
From:       cvsrep () annvix ! org
Date:       2005-09-28 4:40:41
Message-ID: E1EKTkH-00035T-N6 () build ! annvix ! org
[Download RAW message or body]

Module name:   packages/mdadm
Changes by:    vdanen
Date:          2005/09/28 04:40:41

Commit log:
- execline the runscript

Index: mdadm.run
===================================================================
RCS file: /work/annvix/cvsroot/packages/mdadm/mdadm.run,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- mdadm.run	29 Mar 2005 03:50:24 -0000	1.2
+++ mdadm.run	28 Sep 2005 04:40:41 -0000	1.2.4.1
@@ -1,19 +1,13 @@
-#!/bin/sh
-PATH="/sbin:/usr/sbin:/bin:/usr/bin"
+#!/bin/execlineb
 
-# this runs mdadm supervised
+/bin/fdmove -c 2 1
 
-. /usr/share/srv/functions
-
-if [ ! -f /etc/mdadm.conf ]; then
-  echo "/etc/mdadm.conf doesn't exist and is required to run mdadm!"
-  godown
-fi
-
-if [ "`grep '^\(MAILADDR\|PROGRAM\) .' /etc/mdadm.conf >/dev/null 2>&1; echo $?`" = "1" ]; then
-  echo "MAILADDR or PROGRAM must be set in /etc/mdadm.conf to run mdadm!"
-  godown
-fi
-
-exec /sbin/mdadm --monitor --scan 2>&1
+/bin/export PATH "/sbin:/bin:/usr/sbin:/usr/bin"
 
+/bin/ifthenelse { /usr/bin/test ! -f /etc/amd.conf }
+{
+    /bin/echo "/etc/mdadm.conf doesn't exist and is required to run mdadm!"
+}
+{
+    /sbin/mdadm --monitor --scan
+}
\ No newline at end of file

Index: mdadm.spec
===================================================================
RCS file: /work/annvix/cvsroot/packages/mdadm/mdadm.spec,v
retrieving revision 1.2.4.5
retrieving revision 1.2.4.6
diff -u -r1.2.4.5 -r1.2.4.6
--- mdadm.spec	4 Sep 2005 00:33:40 -0000	1.2.4.5
+++ mdadm.spec	28 Sep 2005 04:40:41 -0000	1.2.4.6
@@ -9,7 +9,7 @@
 
 %define name		mdadm
 %define version		1.12.0
-%define release		2avx
+%define release		3avx
 
 %define use_dietlibc 	0
 %ifarch %{ix86} x86_64 ppc
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Tue Sep 27 2005 Vincent Danen <vdanen@annvix.org> 1.12.0-3avx
+- execline the runscript
+
 * Sat Sep 03 2005 Vincent Danen <vdanen@annvix.org> 1.12.0-2avx
 - 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]