rpms/ocsinventory-agent/F-11 ocsinventory-agent.cron, 1.1, 1.2 ocsinventory-agent.spec, 1.10, 1.11

Remi Collet remi at fedoraproject.org
Thu May 14 15:24:30 UTC 2009


Author: remi

Update of /cvs/extras/rpms/ocsinventory-agent/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14495

Modified Files:
	ocsinventory-agent.cron ocsinventory-agent.spec 
Log Message:
minor bugfix - workaround for #500594 + tool path if needed


Index: ocsinventory-agent.cron
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/F-11/ocsinventory-agent.cron,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ocsinventory-agent.cron	8 Mar 2008 20:09:11 -0000	1.1
+++ ocsinventory-agent.cron	14 May 2009 15:23:59 -0000	1.2
@@ -5,6 +5,7 @@ exec >>/var/log/$NAME/$NAME.log 2>&1 
 
 [ -f   /etc/sysconfig/$NAME ] || exit 0
 source /etc/sysconfig/$NAME
+export PATH
 
 i=0
 while [ $i -lt ${#OCSMODE[*]} ]
@@ -26,10 +27,10 @@ do
 	        	# Remote inventory
 		        OPTS="$OPTS --lazy --server=${OCSSERVER[$i]}"	
 		fi
-		echo "[$(date '+%D %T')]" Running $NAME $OPTS
+		echo "[$(date '+%c')] Running $NAME $OPTS"
 		/usr/sbin/$NAME  $OPTS
 	fi
 	((i++))
 done
-echo "[$(date '+%D %T')]" End of cron job
+echo "[$(date '+%c')] End of cron job ($PATH)"
 


Index: ocsinventory-agent.spec
===================================================================
RCS file: /cvs/extras/rpms/ocsinventory-agent/F-11/ocsinventory-agent.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ocsinventory-agent.spec	29 Mar 2009 09:02:04 -0000	1.10
+++ ocsinventory-agent.spec	14 May 2009 15:23:59 -0000	1.11
@@ -6,7 +6,7 @@ Name:      ocsinventory-agent
 Summary:   Open Computer and Software Inventory Next Generation client
 
 Version:   1.0.1
-Release:   1%{?dist}%{?ocstag:.%{ocstag}}
+Release:   4%{?dist}%{?ocstag:.%{ocstag}}
 
 Source0:   http://search.cpan.org/CPAN/authors/id/G/GO/GONERI/Ocsinventory-Agent-%{version}.tar.gz
 #Source0:    http://nana.rulezlan.org/~goneri/ocsinventory-agent/Ocsinventory-Agent-nobundle-%{version}.tar.gz
@@ -78,6 +78,10 @@ cat <<EOF >%{name}.conf
 # OCS Inventory "Unix Unified Agent" Configuration File
 # used by hourly cron job
 #
+
+# Add tools directory if needed (tw_cli, hpacucli, ipssend, ...)
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
 %if 0%{?ocsserver:1}
 # Mode, change to "none" to disable
 OCSMODE[0]=cron
@@ -89,7 +93,7 @@ OCSMODE[0]=none
 %endif
 
 # can be used to override the %{name}.cfg setup.
-# OCSSERVER[0]=http://your.ocsserver.name/ocsinventory
+# OCSSERVER[0]=your.ocsserver.name
 # 
 # corresponds with --local=%{_localstatedir}/lib/%{name}
 # OCSSERVER[0]=local
@@ -112,7 +116,7 @@ cat <<EOF >%{name}.cfg
 server = http://%{ocsserver}/ocsinventory
 %else
 # Server URL, unconmment if needed
-# server = http://your.ocsserver.name/ocsinventory
+# server = your.ocsserver.name
 local = %{_localstatedir}/lib/%{name}
 %endif
 
@@ -187,6 +191,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu May 14 2009 Remi Collet <Fedora at famillecollet.com> 1.0.1-4
+- fix typo
+
+* Thu May 14 2009 Remi Collet <Fedora at famillecollet.com> 1.0.1-3
+- define PATH in config (workaround for #500594 + tool path if needed)
+ 
+* Fri Apr 24 2009 Remi Collet <Fedora at famillecollet.com> 1.0.1-2
+- update the README.RPM (new configuration file)
+- change from URL to only servername in config comment
+
 * Sun Mar 29 2009 Remi Collet <Fedora at famillecollet.com> 1.0.1-1
 - update to 1.0.1
 




More information about the scm-commits mailing list