From a302d11f21857552794c70f6b7920953a1d6a5c7 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Sun, 9 Oct 2011 00:16:39 +0200
Subject: [PATCH] Add patch torque-initd-hangs-rhbz-744138.patch

Conflicts:

	torque.spec
---
 torque-initd-hangs-rhbz-744138.patch | 19 +++++++++++++++++++
 torque.spec                          | 11 +++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 torque-initd-hangs-rhbz-744138.patch

diff --git a/torque-initd-hangs-rhbz-744138.patch b/torque-initd-hangs-rhbz-744138.patch
new file mode 100644
index 0000000..c0ffbd2
--- /dev/null
+++ b/torque-initd-hangs-rhbz-744138.patch
@@ -0,0 +1,19 @@
+diff -uNr torque-3.0.2.ORIG/contrib/init.d/pbs_server torque-3.0.2/contrib/init.d/pbs_server
+--- torque-3.0.2.ORIG/contrib/init.d/pbs_server	2011-10-09 00:09:29.026651535 +0200
++++ torque-3.0.2/contrib/init.d/pbs_server	2011-10-09 00:12:05.012653474 +0200
+@@ -14,13 +14,11 @@
+         echo "Configuration already exists.  Please remove $PBS_SERVERDB to create a new one."
+         exit 1
+     fi
+-
+     $PBS_DAEMON -d $PBS_HOME -t create &
+-    while [ ! -r $PBS_SERVERDB ]; do
+-        sleep 1
+-    done
++    sleep 5
+     killproc pbs_server
+     RET=$?
++
+ }
+ 
+ start() {
diff --git a/torque.spec b/torque.spec
index 4f85d71..9caf9e0 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
 
 Name:        torque
 Version:     2.5.7
-Release:     3%{?dist}
+Release:     4%{?dist}
 Summary:     Tera-scale Open-source Resource and QUEue manager
 Source0:     http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
 Source2:     xpbs.desktop
@@ -81,6 +81,9 @@ Source8:     config
 # https://bugzilla.redhat.com/show_bug.cgi?id=713996
 Patch0:      torque-munge-size.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=744138
+Patch2:      torque-initd-hangs-rhbz-744138.patch
+
 License:     OpenPBS and TORQUEv1.1
 Group:       System Environment/Daemons
 URL:         http://www.clusterresources.com/products/torque/
@@ -336,7 +339,8 @@ DRMAA is "Distributed Resource Management Application API"
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p 1
+%patch2 -p 1
 install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
    %{SOURCE6} %{SOURCE8} .
 # rm x bit on some documentation.
@@ -785,6 +789,9 @@ fi
 %endif
 
 %changelog
+* Sun Oct  9 2011 Steve Traylen <steve.traylen@cern.ch> - 2.5.7-4
+- Add patch torque-initd-hangs-rhbz-744138.patch
+
 * Mon Sep 19 2011 Steve Traylen <steve.traylen@cern.ch> - 2.5.7-3
 - Add --with-tcp-retry-limit=2 to build, rhbz#738576.