Commit a6921f58 authored by Leigh B Stoller's avatar Leigh B Stoller

Fix query that was using old style os_info table instead of newer versions

table.
parent 8400f8d0
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2013 University of Utah and the Flux Group.
# Copyright (c) 2000-2016 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -1017,10 +1017,12 @@ sub doSwapin($) {
" vn.eid=e.eid and vn.vname=vl.vnode ".
"left join os_info as o on o.osname=vn.osname and ".
" (o.pid=vl.pid or o.pid='" . TBOPSPID() . "') ".
"left join os_info_versions as ov on ".
" ov.osid=o.osid and ov.vers=o.version ".
"where (vl.uselinkdelay!=0 or e.uselinkdelays!=0 or ".
" e.forcelinkdelays!=0) and ".
" (o.os is NULL or o.os='Linux' or ".
" o.os='Fedora') and ".
" (ov.os is NULL or ov.os='Linux' or ".
" ov.os='Fedora') and ".
" e.pid='$pid' and e.eid='$eid'");
if ($db_result->numrows) {
......
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