From 4218dfcb344eb4726d63a9cc456911d25c5813af Mon Sep 17 00:00:00 2001 From: Andrew McNab <andrew.mcnab@cern.ch> Date: Tue, 3 May 2016 12:48:48 +0200 Subject: [PATCH] Put mjf-get-total-cpu in /usr/sbin --- Makefile | 4 ++-- mjf-get-total-cpu.torque | 2 +- mjf.init | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c88aabb..1167665 100644 --- a/Makefile +++ b/Makefile @@ -56,11 +56,11 @@ torque-install: $(INSTALL_FILES) install cp mjf-torque.csh \ $(RPM_BUILD_ROOT)/etc/profile.d/mjf.csh 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 \ $(RPM_BUILD_ROOT)/var/lib/torque/mom_priv 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 diff --git a/mjf-get-total-cpu.torque b/mjf-get-total-cpu.torque index 9486298..b5a8ef8 100755 --- a/mjf-get-total-cpu.torque +++ b/mjf-get-total-cpu.torque @@ -4,7 +4,7 @@ # Requires that the pbsnodes command is installed and that you have # 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 ! # # Andrew.McNab@cern.ch diff --git a/mjf.init b/mjf.init index 5b0a94e..2a2ebaa 100755 --- a/mjf.init +++ b/mjf.init @@ -39,8 +39,8 @@ start() { if [ "$total_cpu" == "" ] ; then # If not explicitly configured then try to get it from the batch system - if [ -x /usr/bin/mjf-get-total-cpu ] ; then - total_cpu=`/usr/bin/mjf-get-total-cpu` + if [ -x /usr/sbin/mjf-get-total-cpu ] ; then + total_cpu=`/usr/sbin/mjf-get-total-cpu` fi # If still not explicitly configured then it get from the OS -- GitLab