Commit 679e8684 authored by Leigh Stoller's avatar Leigh Stoller

More tweaks and bug fixes.

parent 600d1c7c
......@@ -286,7 +286,7 @@ if ($install) {
print "Installing testbed software ... this will take a while!\n";
print "Output saved to $tempfile\n";
system("cd ..; gmake boss-install-noupdatecheck >$tempfile 2>&1");
system("(cd ..; gmake; gmake boss-install-noupdatecheck) >$tempfile 2>&1");
if ($?) {
exit(1);
}
......
......@@ -47,6 +47,7 @@ sub InstallUpdate($$)
if (-e "$VARRUN/checknodes.pid" &&
! ExecQuiet("pgrep -f checknodes_daemon")) {
SignalDaemon("checknodes", "TERM");
ExecQuiet("/bin/rm -f $VARRUN/checknodes.pid");
};
RestartDaemon("checknodes_daemon");
};
......
......@@ -132,9 +132,6 @@ case "$1" in
if [ -r /var/run/checkup_daemon.pid ]; then
kill `cat /var/run/checkup_daemon.pid`
fi
if [ -r /var/run/checkup_daemon.pid ]; then
kill `cat /var/run/checkup_daemon.pid`
fi
if [ -r /var/run/pool_daemon.pid ]; then
kill `cat /var/run/pool_daemon.pid`
fi
......@@ -150,6 +147,9 @@ case "$1" in
if [ -r /var/run/checknodes.pid ]; then
kill `cat /var/run/checknodes.pid`
fi
if [ -r /var/run/checknodes_daemon.pid ]; then
kill `cat /var/run/checknodes_daemon.pid`
fi
if [ -r /var/run/batch_daemon_wrapper.pid ]; then
kill `cat /var/run/batch_daemon_wrapper.pid`
fi
......
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