Index: trunk/Nebulous/bin/neb-addvol
===================================================================
--- trunk/Nebulous/bin/neb-addvol	(revision 13074)
+++ trunk/Nebulous/bin/neb-addvol	(revision 16179)
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
-# Copyright (C) 2005-2007  Joshua Hoblitt
+# Copyright (C) 2005-2008  Joshua Hoblitt
 #
-# $Id: neb-addvol,v 1.5 2007-04-28 01:19:59 jhoblitt Exp $
+# $Id: neb-addvol,v 1.6 2008-01-22 21:14:55 jhoblitt Exp $
 
 use strict;
@@ -18,5 +18,5 @@
 use Pod::Usage qw( pod2usage );
 
-my ($db, $dbuser, $dbpass, $name, $uri);
+my ($db, $dbuser, $dbpass, $volume, $uri);
 
 $db     = $ENV{'NEB_DB'} unless $db;
@@ -28,5 +28,5 @@
     'user=s'    => \$dbuser,
     'pass=s'    => \$dbpass,
-    'name=s'    => \$name,
+    'volume=s'  => \$volume,
     'uri=s'     => \$uri,
 ) || pod2usage( 2 );
@@ -34,5 +34,5 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage( -msg => "Required options: --db --user --pass", -exitval => 2 )
-    unless $db && $dbuser && $dbpass && $name && $uri;
+    unless $db && $dbuser && $dbpass && $volume && $uri;
 
 my $dbh = DBI->connect(
@@ -61,5 +61,5 @@
 
 my $query = $dbh->prepare( $sql->new_volume );
-$query->execute( $name, $path );
+$query->execute( $volume, $path );
 
 print " OK\n";
@@ -75,5 +75,6 @@
 =head1 SYNOPSIS
 
-    neb-addvol --name <volume name> --uri <volume uri> [--db <database>] [--user <username>] [--pass <password>]
+    neb-addvol --volume <volume name> --uri <volume uri>
+        [--db <database>] [--user <username>] [--pass <password>]
 
 =head1 DESCRIPTION
@@ -87,5 +88,5 @@
 =over 4
 
-=item * --name|-n <volume name>
+=item * --volume|-n <volume name>
 
 Symbolic name of volume being added.
@@ -151,5 +152,5 @@
 =head1 COPYRIGHT
 
-Copyright (C) 2005-2007  Joshua Hoblitt.  All rights reserved.
+Copyright (C) 2005-2008  Joshua Hoblitt.  All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under