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";