Commit 8cecbb91 authored by Mike Hibler's avatar Mike Hibler
Browse files

Stop using no longer maintained subboss_images table for loadinfo.

This was causing some (most) d710s to load images from boss rather than
the subboss.
parent fc48cdee
...@@ -4542,17 +4542,11 @@ COMMAND_PROTOTYPE(doloadinfo) ...@@ -4542,17 +4542,11 @@ COMMAND_PROTOTYPE(doloadinfo)
prepare = row[6]; prepare = row[6];
res2 = mydb_query("select IP " res2 = mydb_query("select IP "
"from subboss_images as i " " from interfaces as i, subbosses as s "
"left join subbosses as s " " where i.node_id=s.subboss_id and "
" on s.subboss_id=i.subboss_id " " i.role='ctrl' and "
"left join interfaces as n " " s.node_id='%s' and s.service='frisbee'",
" on n.node_id=s.subboss_id " 1, reqp->nodeid);
"where s.node_id='%s' and "
" s.service='frisbee' and "
" i.imageid='%s' and "
" n.role='ctrl' and i.sync!=1",
1, reqp->nodeid, row[5]);
if (!res2) { if (!res2) {
error("doloadinfo: %s: DB Error getting subboss info!\n", error("doloadinfo: %s: DB Error getting subboss info!\n",
reqp->nodeid); reqp->nodeid);
......
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