spacewalk/admin/spacewalk-admin.spec | 1 + spacewalk/admin/spacewalk-service | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit b1927976d4c9e5e2c3381a87c317cedfab6b377f Author: Jan Pazdziora jpazdziora@redhat.com Date: Mon Feb 7 09:17:17 2011 +0100
Explicitly require lsof in spacewalk-admin (for spacewalk-service).
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec index def09bf..61c9832 100644 --- a/spacewalk/admin/spacewalk-admin.spec +++ b/spacewalk/admin/spacewalk-admin.spec @@ -12,6 +12,7 @@ Requires: spacewalk-base Requires: perl-URI, perl(MIME::Base64) Requires: sudo Requires: /sbin/restorecon +Requires: /usr/sbin/lsof Obsoletes: satellite-utils < 5.3.0 Provides: satellite-utils = 5.3.0 Obsoletes: rhn-satellite-admin < 5.3.0 diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-service index 6af0b38..f5e823c 100755 --- a/spacewalk/admin/spacewalk-service +++ b/spacewalk/admin/spacewalk-service @@ -49,10 +49,10 @@ forward_services() { if [ "$service" == "$TOMCAT" \ -a "$ACTION" == "start" \ -a "$WAIT_FOR_TOMCAT" == "1" ] ; then - if lsof /proc > /dev/null ; then + if /usr/sbin/lsof /proc > /dev/null ; then echo "Waiting for tomcat to be ready ..." while [ -f "/var/run/$TOMCAT.pid" ] ; do - lsof -t -i @localhost:8009 -p $(cat /var/run/$TOMCAT.pid) > /dev/null && break + /usr/sbin/lsof -t -i @localhost:8009 -p $(cat /var/run/$TOMCAT.pid) > /dev/null && break sleep 1 done else
spacewalk-commits@lists.fedorahosted.org