diff --git a/README-localhost b/README-localhost new file mode 100644 index 0000000..c63a012 --- /dev/null +++ b/README-localhost @@ -0,0 +1,20 @@ +To setup a basic single-node localhost-only batch system, install the +torque-server, torque-mom, and torque-scheduler packages, and do something like +this: + +/sbin/chkconfig pbs_mom on +/sbin/chkconfig pbs_server on +/sbin/chkconfig pbs_sched on +/bin/hostname --long > %{torquehomedir}/server_priv/nodes +/bin/hostname --long > %{torquehomedir}/server_name +service pbs_server start +qmgr -c "s s scheduling=true" +qmgr -c "c q batch queue_type=execution" +qmgr -c "s q batch started=true" +qmgr -c "s q batch enabled=true" +qmgr -c "s q batch resources_default.nodes=1" +qmgr -c "s q batch resources_default.walltime=3600" +qmgr -c "s s default_queue=batch" +service pbs_mom restart +service pbs_sched restart + diff --git a/torque.spec b/torque.spec index 5ed6d9f..40a73e1 100644 --- a/torque.spec +++ b/torque.spec @@ -3,7 +3,7 @@ %define name torque %define version 2.1.0p0 #%%define snap 200604251602 -%define release 2 +%define release 3 # The following options are supported: # --with server_name=hostname @@ -90,6 +90,7 @@ Source2: xpbs.desktop Source3: xpbsmon.desktop Source4: xpbs.png Source5: xpbsmon.png +Source6: README-localhost Patch1: torque-2.1.0-remove-rpath.path Patch2: torque-2.1.0p0-mom_sync_jobs-fixes.patch License: Freely redistributable (See PBS_License.txt) @@ -99,6 +100,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: pbs BuildRequires: desktop-file-utils Conflicts: pbspro, openpbs, openpbs-oscar +Obsoletes: torque-localhost %if %use_tcl BuildRequires: tcl-devel @@ -122,7 +124,7 @@ This package holds just a few shared files and directories. %patch1 -p1 %patch2 -p0 -%__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . +%__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} . %build @@ -194,7 +196,7 @@ fi %files %defattr(-, root, root) -%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt +%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost %config(noreplace) %{torquehomedir}/pbs_environment %config(noreplace) %{torquehomedir}/server_name %{torquehomedir}/aux @@ -350,45 +352,6 @@ This package holds the graphical clients. %endif -%package localhost -Group: Applications/System -Summary: Installs and configures a minimal localhost-only batch queue system -Requires(post): %{name}-mom %{name}-server %{name}-client %{name}-scheduler - -%description localhost -%shared_description -This package installs and configures a minimal localhost-only batch queue -system. - -%files localhost -%defattr(-, root, root) -%pre localhost -if [ -f %{torquehomedir}/server_priv/serverdb ];then - echo "This package wipes out the existing server configuration. Remove" 1>&2 - echo "%{torquehomedir}/server_priv/serverdb if you really want this." 1>&2 - exit 1 -fi -%post localhost -/sbin/chkconfig pbs_mom on -/sbin/chkconfig pbs_server on -/sbin/chkconfig pbs_sched on -/bin/hostname --long > %{torquehomedir}/server_priv/nodes -/bin/hostname --long > %{torquehomedir}/server_name -/bin/hostname --long > %{torquehomedir}/mom_priv/config -pbs_server -t create -qmgr -c "s s scheduling=true" -qmgr -c "c q batch queue_type=execution" -qmgr -c "s q batch started=true" -qmgr -c "s q batch enabled=true" -qmgr -c "s q batch resources_default.nodes=1" -qmgr -c "s q batch resources_default.walltime=3600" -qmgr -c "s s default_queue=batch" -%{_initrddir}/pbs_mom restart -%{_initrddir}/pbs_sched restart -%{_initrddir}/pbs_server restart -qmgr -c "s n `/bin/hostname --long` state=free" -e - - %package -n lib%{name} Summary: Run-time libs for programs which will use the %{name} library Group: Development/Libraries @@ -425,6 +388,9 @@ necessary for developing programs which will use %{name}. %changelog +* Mon May 15 2006 Garrick Staples 2.1.0p0-3 +- get rid of the annoying "localhost only" package + * Fri May 12 2006 Garrick Staples 2.1.0p0-2 - fix pbs_server segfault when mom_job_sync is enabled