remove size helper, include volsize in list

diff --git a/README b/README
index 03e41c8..f5c0288 100644 (file)
--- a/README
+++ b/README
@@ -24,7 +24,8 @@ daily-block-snapshot  purge-log
 Overview commands are available (try running them to see output):
 
 # ls bin/
-ill  list  node  size  snap
+backup  ill  instance  list  node  snap
+
 
 Create test instances:
 

diff --git a/bin/list b/bin/list
index c12304c..9360eee 100755 (executable)
--- a/bin/list
+++ b/bin/list
@@ -2,4 +2,4 @@
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
-zfs list -r $EXTP_ZFS -o name,logicalused,used,available,refer,ganeti:originstname
+zfs list -r $EXTP_ZFS -o name,volsize,logicalused,used,available,refer,ganeti:originstname

diff --git a/bin/size b/bin/size
deleted file mode 100755 (executable)
index 58e4f5a..0000000
--- a/bin/size
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. /usr/share/ganeti/extstorage/zfs/defaults.sh
-
-zfs get volsize -t volume -r $EXTP_ZFS