[pve-devel] r6369 - in pve-storage/pve2: . PVE/API2/Storage

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-07-27 12:34:45 +0200 (Wed, 27 Jul 2011)
New Revision: 6369

Modified:
   pve-storage/pve2/ChangeLog
   pve-storage/pve2/PVE/API2/Storage/Config.pm
Log:
 add option 'base'


Modified: pve-storage/pve2/ChangeLog
===================================================================
--- pve-storage/pve2/ChangeLog	2011-07-27 10:33:05 UTC (rev 6368)
+++ pve-storage/pve2/ChangeLog	2011-07-27 10:34:45 UTC (rev 6369)
@@ -1,3 +1,7 @@
+2011-07-27  Proxmox Support Team  <support at proxmox.com>
+
+	* PVE/API2/Storage/Config.pm (create): add option 'base' 
+
 2011-07-26  Proxmox Support Team  <support at proxmox.com>
 
 	* PVE/Storage.pm (verify_portal_dns): new type

Modified: pve-storage/pve2/PVE/API2/Storage/Config.pm
===================================================================
--- pve-storage/pve2/PVE/API2/Storage/Config.pm	2011-07-27 10:33:05 UTC (rev 6368)
+++ pve-storage/pve2/PVE/API2/Storage/Config.pm	2011-07-27 10:34:45 UTC (rev 6369)
@@ -132,6 +132,10 @@
 		type => 'string', format => 'pve-storage-vgname',
 		optional => 1,
             },
+	    base => {
+		type => 'string', format => 'pve-volume-id',
+		optional => 1,
+	    },
             portal => {
 		type => 'string', format => 'pve-storage-portal-dns',
 		optional => 1,
@@ -311,7 +315,8 @@
 		die "can't remove storage - storage is used as base of another storage\n"
 		    if PVE::Storage::storage_is_used ($cfg, $storeid);
 
-		PVE::Storage::deactivate_storage ($cfg, $storeid);
+		eval { PVE::Storage::deactivate_storage($cfg, $storeid); };
+		syslog("info", "unable to deactivate storage '$storeid' - $@") if $@;
 
 		delete ($cfg->{ids}->{$storeid});