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

Change nobootinfo to notmcdinfo and insert those attributes

into node_type_attributes for the two node types that were
using nobootinfo.
parent 47d9811e
......@@ -4597,10 +4597,10 @@ iptonodeid(struct in_addr ipaddr, tmcdreq_t *reqp, char* nodekey)
"LEFT OUTER JOIN "
" (SELECT type,attrvalue "
" FROM node_type_attributes "
" WHERE attrkey='nobootinfo' "
" WHERE attrkey='notmcdinfo' "
" AND attrvalue='1' "
" GROUP BY type) AS nobootinfo_types "
" ON n.type=nobootinfo_types.type "
" GROUP BY type) AS notmcdinfo_types "
" ON n.type=notmcdinfo_types.type "
"LEFT OUTER JOIN "
" (SELECT type,attrvalue "
" FROM node_type_attributes "
......@@ -4610,7 +4610,7 @@ iptonodeid(struct in_addr ipaddr, tmcdreq_t *reqp, char* nodekey)
"WHERE n.node_id IN "
" (SELECT node_id FROM widearea_nodeinfo "
" WHERE privkey='%s') "
" AND nobootinfo_types.attrvalue IS NULL",
" AND notmcdinfo_types.attrvalue IS NULL",
34, nodekey);
}
else if (reqp->isvnode) {
......@@ -4705,10 +4705,10 @@ iptonodeid(struct in_addr ipaddr, tmcdreq_t *reqp, char* nodekey)
"left outer join "
" (select type,attrvalue "
" from node_type_attributes "
" where attrkey='nobootinfo' "
" where attrkey='notmcdinfo' "
" and attrvalue='1' "
" group by type) as nobootinfo_types "
" on n.type=nobootinfo_types.type "
" group by type) as notmcdinfo_types "
" on n.type=notmcdinfo_types.type "
"left outer join "
" (select type,attrvalue "
" from node_type_attributes "
......@@ -4716,7 +4716,7 @@ iptonodeid(struct in_addr ipaddr, tmcdreq_t *reqp, char* nodekey)
" group by type) as dedicated_wa_types "
" on n.type=dedicated_wa_types.type "
"where (%s) "
" and nobootinfo_types.attrvalue is NULL",
" and notmcdinfo_types.attrvalue is NULL",
34, clause);
}
......
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