Author: glen Date: Tue Dec 7 14:12:48 2010 GMT Module: packages Tag: HEAD ---- Log message: - move daemon to sbindir
---- Files affected: packages/nagios-merlin: merlind.init (1.1 -> 1.2) , nagios-merlin.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/nagios-merlin/merlind.init diff -u packages/nagios-merlin/merlind.init:1.1 packages/nagios-merlin/merlind.init:1.2 --- packages/nagios-merlin/merlind.init:1.1 Tue Dec 7 14:38:48 2010 +++ packages/nagios-merlin/merlind.init Tue Dec 7 15:12:43 2010 @@ -31,6 +31,7 @@ # Get service config - may override defaults [ -f /etc/sysconfig/merlind ] && . /etc/sysconfig/merlind +daemon=/usr/sbin/merlind pidfile="/var/run/merlind.pid" config_file=/etc/nagios/merlin.conf @@ -42,7 +43,7 @@ fi msg_starting "Merlin Daemon" - daemon /usr/sbin/merlind -c "$config_file" + daemon $daemon -c "$config_file" RETVAL=$? [ $RETVAL -eq 0 ] && touch /var/lock/subsys/merlind } @@ -55,7 +56,7 @@ # Stop daemons. msg_stopping "Merlin Daemon"; busy - /usr/sbin/merlind -c "$config_file" -k && ok || fail + $daemon -c "$config_file" -k && ok || fail rm -f /var/lock/subsys/merlind } ================================================================ Index: packages/nagios-merlin/nagios-merlin.spec diff -u packages/nagios-merlin/nagios-merlin.spec:1.2 packages/nagios-merlin/nagios-merlin.spec:1.3 --- packages/nagios-merlin/nagios-merlin.spec:1.2 Tue Dec 7 14:40:55 2010 +++ packages/nagios-merlin/nagios-merlin.spec Tue Dec 7 15:12:43 2010 @@ -2,7 +2,7 @@ Summary: Merlin: Module for Effortless Redundancy and Loadbalancing In Nagios Name: nagios-merlin Version: 0.9.0 -Release: 0.1 +Release: 0.2 License: GPL v2 Group: Networking Source0: http://www.op5.org/op5media/op5.org/downloads/merlin-%{version}.tar.gz @@ -63,6 +63,9 @@ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/merlind +install -d $RPM_BUILD_ROOT%{_sbindir} +mv $RPM_BUILD_ROOT{%{_appdir},%{_sbindir}}/merlind + install -d $RPM_BUILD_ROOT%{_sysconfdir} mv $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir}}/merlin.conf @@ -75,12 +78,12 @@ %doc example.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/merlin.conf %attr(754,root,root) /etc/rc.d/init.d/merlind +%attr(755,root,root) %{_sbindir}/merlind %{_appdir}/db.sql %{_appdir}/object_importer.inc.php %attr(755,root,root) %{_appdir}/import %attr(755,root,root) %{_appdir}/import.php %attr(755,root,root) %{_appdir}/merlin.so -%attr(755,root,root) %{_appdir}/merlind %attr(755,root,root) %{_appdir}/showlog %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -89,6 +92,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2010/12/07 14:12:43 glen +- move daemon to sbindir + Revision 1.2 2010/12/07 13:40:55 glen - fix ac build ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-merlin/merlind.init?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-merlin/nagios-merlin.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit