Commit edef810d authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents 7d2fbd58 4de54596
......@@ -219,6 +219,11 @@ if (!open(FRIS, "$cmd 2>&1 |")) {
while (<FRIS>) {
if (/^error=(.*)$/) {
if ($1 != 0) {
# For killmode we take an error to mean no daemon is running
if ($killmode) {
$running = 0;
last;
}
Fatal("frisbee returned error=$1");
}
next;
......
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