Commit b55319e5 authored by Leigh Stoller's avatar Leigh Stoller

Minor fixes resulting from recent changes to osids and imageids.

parent d212b4cf
/* /*
* EMULAB-COPYRIGHT * EMULAB-COPYRIGHT
* Copyright (c) 2000-2004, 2006 University of Utah and the Flux Group. * Copyright (c) 2000-2007 University of Utah and the Flux Group.
* All rights reserved. * All rights reserved.
*/ */
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <mysql/mysql.h> #include <mysql/mysql.h>
/* XXX Should be configured in */ /* XXX Should be configured in */
#define NEWNODEPID "emulab-ops"
#define NEWNODEOSID "NEWNODE-MFS" #define NEWNODEOSID "NEWNODE-MFS"
#ifdef USE_MYSQL_DB #ifdef USE_MYSQL_DB
...@@ -291,13 +292,13 @@ boot_newnode_mfs(struct in_addr ipaddr, int version, boot_what_t *info) ...@@ -291,13 +292,13 @@ boot_newnode_mfs(struct in_addr ipaddr, int version, boot_what_t *info)
MYSQL_RES *res; MYSQL_RES *res;
MYSQL_ROW row; MYSQL_ROW row;
error("%s: nonexistent IP, booting '%s'\n", error("%s: nonexistent IP, booting '%s,%s'\n",
inet_ntoa(ipaddr), NEWNODEOSID); inet_ntoa(ipaddr), NEWNODEPID, NEWNODEOSID);
#define MFS_PATH 0 #define MFS_PATH 0
res = mydb_query("select path from os_info " res = mydb_query("select path from os_info where pid='%s' and "
"where osid='%s' and mfs=1", 1, NEWNODEOSID); "osname='%s' and mfs=1", 1, NEWNODEPID, NEWNODEOSID);
if (!res) { if (!res) {
error("Query failed\n"); error("Query failed\n");
......
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