Commit 3f3908e1 authored by Mike Hibler's avatar Mike Hibler

Add 4th param to ExpNodes calls just in case optional params don't work

as I think: if the proto is foo($$;$$), can it be called with three params,
or must it be 2 or 4?
parent 718d7a2b
...@@ -633,7 +633,7 @@ if (! ($frontend || $batchmode)) { ...@@ -633,7 +633,7 @@ if (! ($frontend || $batchmode)) {
# Look for the unsual case of more than 2 nodes and no vlans. Send a # Look for the unsual case of more than 2 nodes and no vlans. Send a
# warning message. # warning message.
# #
my @localnodes = ExpNodes($pid, $eid, 1); my @localnodes = ExpNodes($pid, $eid, 1, 0);
if (@localnodes && scalar(@localnodes) > 2) { if (@localnodes && scalar(@localnodes) > 2) {
my $vlans_result = my $vlans_result =
......
...@@ -836,7 +836,7 @@ sub osload_setupswapinfo($$;@) ...@@ -836,7 +836,7 @@ sub osload_setupswapinfo($$;@)
my $clause = ""; my $clause = "";
if (!@nodelist) { if (!@nodelist) {
@nodelist = ExpNodes($pid, $eid, 1); @nodelist = ExpNodes($pid, $eid, 1, 0);
$clause .= "r.pid='$pid' and r.eid='$eid'"; $clause .= "r.pid='$pid' and r.eid='$eid'";
$allnodes = 1; $allnodes = 1;
} else { } else {
......
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