diff --git a/Makefile b/Makefile index c88aabb9bc0b8cf64e3b3f03321b473beccf6ff4..11676651f122ed63837b6f260a059f4774804c1b 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 948629899b2258631be39b1f04d2e23f23c0c496..b5a8ef8ac34b065ccec69dfd23b7997747fc292a 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 5b0a94e4d5055013f22b97eb05c6d03c3d01b5c6..2a2ebaaabc351f68089ad6663c49a1b6823cb72f 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