Index: trunk/Nebulous-Server/Changes
===================================================================
--- trunk/Nebulous-Server/Changes	(revision 18386)
+++ trunk/Nebulous-Server/Changes	(revision 18387)
@@ -2,4 +2,5 @@
 
 0.13
+    - add volume.host field
     - add --host option to neb-initdb
     - add --host option to neb-addvol
Index: trunk/Nebulous-Server/bin/neb-addvol
===================================================================
--- trunk/Nebulous-Server/bin/neb-addvol	(revision 18386)
+++ trunk/Nebulous-Server/bin/neb-addvol	(revision 18387)
@@ -3,5 +3,5 @@
 # Copyright (C) 2005-2008  Joshua Hoblitt
 #
-# $Id: neb-addvol,v 1.9 2008-06-30 22:44:12 jhoblitt Exp $
+# $Id: neb-addvol,v 1.10 2008-06-30 23:14:49 jhoblitt Exp $
 
 use strict;
@@ -19,5 +19,5 @@
 use Pod::Usage qw( pod2usage );
 
-my ($db, $dbhost, $dbuser, $dbpass, $volume, $uri);
+my ($db, $dbhost, $dbuser, $dbpass, $vname, $vhost, $uri);
 
 $db     = $ENV{'NEB_DB'} unless $db;
@@ -27,15 +27,16 @@
 
 GetOptions(
-    'db=s'      => \$db,
-    'host=s'     => \$dbhost,
-    'user=s'    => \$dbuser,
-    'pass=s'    => \$dbpass,
-    'volume=s'  => \$volume,
-    'uri|u=s'   => \$uri,
+    'db|d=s'            => \$db,
+    'host=s'            => \$dbhost,
+    'user|u=s'          => \$dbuser,
+    'pass|p=s'          => \$dbpass,
+    'vname|n=s'         => \$vname,
+    'vhost=s'           => \$vhost,
+    'uri|u=s'           => \$uri,
 ) || pod2usage( 2 );
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --db --user --pass", -exitval => 2 )
-    unless $db && $dbuser && $dbpass && $volume && $uri;
+pod2usage( -msg => "Required options: --db --user --pass --vname --vhost --uri", -exitval => 2 )
+    unless $db && $dbuser && $dbpass && $vname && $vhost && $uri;
 
 my $dbh = DBI->connect(
@@ -64,5 +65,5 @@
 
 my $query = $dbh->prepare( $sql->new_volume );
-$query->execute( $volume, $path );
+$query->execute( $vname, $vhost, $path );
 
 print " OK\n";
Index: trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm
===================================================================
--- trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm	(revision 18386)
+++ trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm	(revision 18387)
@@ -1,5 +1,5 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.57 2008-06-09 20:34:30 jhoblitt Exp $
+# $Id: SQL.pm,v 1.58 2008-06-30 23:14:49 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -201,4 +201,5 @@
         SELECT
             vol_id,
+            host,
             path,
             xattr,
@@ -216,4 +217,5 @@
         SELECT
             vol_id,
+            host,
             path,
             xattr,
@@ -228,9 +230,9 @@
     },
     new_volume          => qq{
-        INSERT INTO volume (name, path, allocate, available, xattr)
-        VALUES (?, ?, TRUE, TRUE, FALSE)
+        INSERT INTO volume (name, host, path, allocate, available, xattr)
+        VALUES (?, ?, ?, TRUE, TRUE, FALSE)
     },
     get_volume_by_name => qq{
-        SELECT vol_id, name, path
+        SELECT vol_id, name, host, path
         FROM volume
         WHERE name = ?
@@ -252,4 +254,5 @@
             count(ins_id) as instances,
             volume.name as volume_name,
+            volume.host as volume_host,
             count(mountedvol.vol_id) as available_instances,
             count(mountedvol.vol_id) > 0 as recoverable,
@@ -366,4 +369,5 @@
     vol_id INT NOT NULL AUTO_INCREMENT,
     name VARCHAR(255) UNIQUE NOT NULL,
+    host VARCHAR(255) NOT NULL,
     path VARCHAR(255) NOT NULL,
     allocate BOOLEAN DEFAULT FALSE,
@@ -372,4 +376,5 @@
     PRIMARY KEY(vol_id),
     KEY(name(16)),
+    KEY(host(16)),
     KEY(path(255)),
     KEY(allocate),