Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
machinejobfeatures
mjf-scripts
Commits
4218dfcb
Commit
4218dfcb
authored
May 03, 2016
by
Andrew McNab
Browse files
Put mjf-get-total-cpu in /usr/sbin
parent
7c693324
Changes
3
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
4218dfcb
...
...
@@ -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/
s
bin
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/
s
bin/mjf-get-total-cpu
torque-rpm
:
mjf-scripts.tgz
...
...
mjf-get-total-cpu.torque
View file @
4218dfcb
...
...
@@ -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/
s
bin/mjf-get-total-cpu to be
# picked up by the generic /etc/rc.d/init.d/mjf !
#
# Andrew.McNab@cern.ch
...
...
mjf.init
View file @
4218dfcb
...
...
@@ -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/
s
bin/mjf-get-total-cpu
]
;
then
total_cpu
=
`
/usr/
s
bin/mjf-get-total-cpu
`
fi
# If still not explicitly configured then it get from the OS
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment