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

Do not use elabinelab_notsetup, use CONFIG_NOSETUP instead.

parent 53eccbbc
...@@ -8175,10 +8175,10 @@ COMMAND_PROTOTYPE(doemulabconfig) ...@@ -8175,10 +8175,10 @@ COMMAND_PROTOTYPE(doemulabconfig)
/* /*
* Stuff from the experiments table. * Stuff from the experiments table.
*/ */
res = mydb_query("select elabinelab_cvstag,elabinelab_nosetup " res = mydb_query("select elabinelab_cvstag "
" from experiments " " from experiments "
"where pid='%s' and eid='%s'", "where pid='%s' and eid='%s'",
2, reqp->pid, reqp->eid); 1, reqp->pid, reqp->eid);
if (!res) { if (!res) {
error("EMULABCONFIG: %s: DB Error getting experiments info\n", error("EMULABCONFIG: %s: DB Error getting experiments info\n",
reqp->nodeid); reqp->nodeid);
...@@ -8191,9 +8191,6 @@ COMMAND_PROTOTYPE(doemulabconfig) ...@@ -8191,9 +8191,6 @@ COMMAND_PROTOTYPE(doemulabconfig)
bufp += OUTPUT(bufp, ebufp - bufp, "CVSSRCTAG=%s\n", bufp += OUTPUT(bufp, ebufp - bufp, "CVSSRCTAG=%s\n",
row[0]); row[0]);
} }
if (row[1] && strcmp(row[1], "0")) {
bufp += OUTPUT(bufp, ebufp - bufp, "NOSETUP=1\n");
}
} }
mysql_free_result(res); mysql_free_result(res);
......
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