Commit 4218dfcb authored by Andrew McNab's avatar Andrew McNab
Browse files

Put mjf-get-total-cpu in /usr/sbin

parent 7c693324
...@@ -56,11 +56,11 @@ torque-install: $(INSTALL_FILES) install ...@@ -56,11 +56,11 @@ torque-install: $(INSTALL_FILES) install
cp mjf-torque.csh \ cp mjf-torque.csh \
$(RPM_BUILD_ROOT)/etc/profile.d/mjf.csh $(RPM_BUILD_ROOT)/etc/profile.d/mjf.csh
mkdir -p $(RPM_BUILD_ROOT)/var/lib/torque/mom_priv mkdir -p $(RPM_BUILD_ROOT)/var/lib/torque/mom_priv
mkdir -p $(RPM_BUILD_ROOT)/usr/bin mkdir -p $(RPM_BUILD_ROOT)/usr/sbin
cp prologue.user epilogue.user \ cp prologue.user epilogue.user \
$(RPM_BUILD_ROOT)/var/lib/torque/mom_priv $(RPM_BUILD_ROOT)/var/lib/torque/mom_priv
cp mjf-get-total-cpu.torque \ cp mjf-get-total-cpu.torque \
$(RPM_BUILD_ROOT)/usr/bin/mjf-get-total-cpu $(RPM_BUILD_ROOT)/usr/sbin/mjf-get-total-cpu
torque-rpm: mjf-scripts.tgz torque-rpm: mjf-scripts.tgz
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Requires that the pbsnodes command is installed and that you have # Requires that the pbsnodes command is installed and that you have
# permission to run it. # permission to run it.
# #
# This script must be installed as /usr/bin/mjf-get-total-cpu to be # This script must be installed as /usr/sbin/mjf-get-total-cpu to be
# picked up by the generic /etc/rc.d/init.d/mjf ! # picked up by the generic /etc/rc.d/init.d/mjf !
# #
# Andrew.McNab@cern.ch # Andrew.McNab@cern.ch
......
...@@ -39,8 +39,8 @@ start() { ...@@ -39,8 +39,8 @@ start() {
if [ "$total_cpu" == "" ] ; then if [ "$total_cpu" == "" ] ; then
# If not explicitly configured then try to get it from the batch system # If not explicitly configured then try to get it from the batch system
if [ -x /usr/bin/mjf-get-total-cpu ] ; then if [ -x /usr/sbin/mjf-get-total-cpu ] ; then
total_cpu=`/usr/bin/mjf-get-total-cpu` total_cpu=`/usr/sbin/mjf-get-total-cpu`
fi fi
# If still not explicitly configured then it get from the OS # If still not explicitly configured then it get from the OS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment