Add patch torque-initd-hangs-rhbz-744138.patch

This commit is contained in:
Steve Traylen 2011-10-09 00:16:39 +02:00
parent 1a17a8fd8f
commit cb579b8d8b
2 changed files with 27 additions and 1 deletions

View File

@ -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() {

View File

@ -71,7 +71,7 @@
Name: torque Name: torque
Version: 3.0.2 Version: 3.0.2
Release: 3%{?dist} Release: 4%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
Source2: xpbs.desktop Source2: xpbs.desktop
@ -89,6 +89,9 @@ Source8: config
# https://bugzilla.redhat.com/show_bug.cgi?id=713996 # https://bugzilla.redhat.com/show_bug.cgi?id=713996
Patch1: torque-munge-size.patch Patch1: 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 License: OpenPBS and TORQUEv1.1
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/ URL: http://www.clusterresources.com/products/torque/
@ -339,6 +342,7 @@ DRMAA is "Distributed Resource Management Application API"
%prep %prep
%setup -q -n torque-%{version} %setup -q -n torque-%{version}
%patch1 -p 1 %patch1 -p 1
%patch2 -p 1
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE8} . %{SOURCE6} %{SOURCE8} .
# rm x bit on some documentation. # rm x bit on some documentation.
@ -786,6 +790,9 @@ fi
%endif %endif
%changelog %changelog
* Sun Oct 9 2011 Steve Traylen <steve.traylen@cern.ch> - 3.0.2-4
- Add patch torque-initd-hangs-rhbz-744138.patch
* Mon Sep 19 2011 Steve Traylen <steve.traylen@cern.ch> - 3.0.2-3 * Mon Sep 19 2011 Steve Traylen <steve.traylen@cern.ch> - 3.0.2-3
- Add --with-tcp-retry-limit=2 to build, rhbz#738576. - Add --with-tcp-retry-limit=2 to build, rhbz#738576.