rpms/fcoe-utils/devel fcoe-utils-1.0.8-init-LSB.patch, NONE, 1.1 fcoe-utils.spec, 1.7, 1.8

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/fcoe-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2078

Modified Files:
	fcoe-utils.spec 
Added Files:
	fcoe-utils-1.0.8-init-LSB.patch 
Log Message:
Update of init script to be LSB-compliant

fcoe-utils-1.0.8-init-LSB.patch:
 initd.fedora |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE fcoe-utils-1.0.8-init-LSB.patch ---
--- fcoe-utils-1.0.8/etc/initd/initd.fedora.orig	2009-09-14 09:40:57.000000000 +0200
+++ fcoe-utils-1.0.8/etc/initd/initd.fedora	2009-09-14 11:06:34.000000000 +0200
@@ -231,11 +231,13 @@
 
 service_status()
 {
+	status=0
 	pidof $FCOEMON
 	if [ $? -eq 0 ]; then
 		echo "$FCOEMON -- RUNNING, pid=`cat $PID_FILE`"
 	else
 		echo "$FCOEMON -- UNUSED"
+		status=3
 	fi
 	IF_LIST=`$FCOEADM -i 2>&1 | \
 		awk '/Symbolic Name:/{print $6}' | \
@@ -244,9 +246,15 @@
 		echo "No interfaces created."
 	else
 		echo "Created interfaces: $IF_LIST"
+		status=0
 	fi
-	test -f /var/lock/subsys/fcoe
-	return $@
+  if [ -f /var/lock/subsys/fcoe -a $status -eq 3 ]; then
+    status=2
+  fi
+  if [ -f /var/run/fcoe.pid -a $status -eq 3 ]; then
+    status=1
+  fi
+	return $status
 }
 
 case "$1" in


Index: fcoe-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/fcoe-utils/devel/fcoe-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fcoe-utils.spec	31 Jul 2009 17:51:10 -0000	1.7
+++ fcoe-utils.spec	14 Sep 2009 10:28:16 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           fcoe-utils
 Version:        1.0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fibre Channel over Ethernet utilities
 
 Group:          Applications/System
@@ -16,6 +16,7 @@ Source1:        quickstart.txt
 Patch0:         fcoe-utils-1.0.7-init.patch
 Patch1:         fcoe-utils-1.0.7-init-condrestart.patch
 Patch2:         fcoe-utils-1.0.8-includes.patch
+Patch3:         fcoe-utils-1.0.8-init-LSB.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    libhbaapi-devel dcbd-devel libtool automake kernel-devel
@@ -34,6 +35,7 @@ fcoemon - service to configure DCB Ether
 %patch0 -p1 -b .initPatch
 %patch1 -p1 -b .condrestartPatch
 %patch2 -p1 -b .includes-fix
+%patch3 -p1 -b .initLSB
 
 %build
 ./bootstrap.sh
@@ -96,6 +98,9 @@ fi
 
 
 %changelog
+* Mon Sep 14 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.8-3
+- update of init script to be LSB-compliant
+
 * Fri Jul 31 2009 Jan Zeleny <jzeleny at redhat.com> - 1.0.8-2
 - patch for clean compilation without usage of upstream's ugly hack