client/tools/osad/osad.spec | 6 +++++- client/tools/osad/prog.init | 16 +++++++++------- rel-eng/packages/osad | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-)
New commits: commit 3bf416cd8e0e76f268cf05114acba9b9e61f9545 Author: Tomas Lestach tlestach@redhat.com Date: Mon Feb 7 11:33:30 2011 +0100
Automatic commit of package [osad] release [5.10.2-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 05f3bfd..5e6c9b4 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -9,7 +9,7 @@ Group: System Environment/Daemons License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 5.10.1 +Version: 5.10.2 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -247,6 +247,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
# $Id$ %changelog +* Mon Feb 07 2011 Tomas Lestach tlestach@redhat.com 5.10.2-1 +- do not check port 5222 on the client (tlestach@redhat.com) + * Thu Feb 03 2011 Tomas Lestach tlestach@redhat.com 5.10.1-1 - Bumping version to 5.10
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index 9e15924..1f522f0 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.10.1-1 client/tools/osad/ +5.10.2-1 client/tools/osad/
commit 08e07ec6fbe55d126c3f456686baeb29f451e31e Author: Tomas Lestach tlestach@redhat.com Date: Mon Feb 7 10:58:36 2011 +0100
do not check port 5222 on the client
+ adding lsof Require for the server
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index c786962..05f3bfd 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -44,6 +44,7 @@ Summary: OSA dispatcher Group: System Environment/Daemons Requires: spacewalk-backend-server >= 1.2.32 Requires: jabberpy +Requires: lsof Conflicts: %{name} < %{version}-%{release} Conflicts: %{name} > %{version}-%{release} Requires(post): chkconfig diff --git a/client/tools/osad/prog.init b/client/tools/osad/prog.init index 5526a87..9005e33 100755 --- a/client/tools/osad/prog.init +++ b/client/tools/osad/prog.init @@ -37,13 +37,15 @@ script="/usr/sbin/@@PROG@@" start() { # Start daemon echo -n "Starting $prog: " - RETRIES=10 - while [ $RETRIES -gt 0 ] - do - lsof -t -i :5222 > /dev/null && break - RETRIES=$((RETRIES-1)) - sleep 0.5 - done + if [ "$prog" == "osa-dispatcher" ]; then + RETRIES=10 + while [ $RETRIES -gt 0 ] + do + lsof -t -i :5222 > /dev/null && break + RETRIES=$((RETRIES-1)) + sleep 0.5 + done + fi daemon $script --pid-file /var/run/$prog.pid RETVAL=$? if [ $RETVAL -eq 0 ]; then echo_success; else echo_failure; fi