Merge pull request #16 from tasleson/new_version_prep_deux

Revert "Revert "New version prep changes""

Author: tasleson

README.md

@@ -45,12 +45,17 @@ an example:
     ssl: false
     target_name: iqn.2003-01.org.example.mach1:1234
 
-    block_pools: [vg-targetd, vg-targetd-too]
+    block_pools: [vg-targetd/thin_pool, vg-targetd-too/thin_pool]
     fs_pools: [/mnt/btrfs]
 
-targetd defaults to using the "vg-targetd" volume group, and username 'admin'.
-The admin password does not have a default -- each installation must set it.
+targetd defaults to using the "vg-targetd/thin_pool" volume group and thin
+pool logical volume, and username 'admin'. The admin password does not have a
+default -- each installation must set it.
 
-Then, run `sudo ./targetd.py`.
+Then, in the root of the source directory, do the following as root:
+```bash
+# export PYTHONPATH=`pwd`
+# ./scripts/targetd`
+```
 
 client.py is a basic testing script, to get started making API calls.

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='targetd',
-    version='0.8.1',
+    version='0.8.5',
     description='Linux remote storage API daemon',
     license='GPLv3',
     maintainer='Andy Grover',

targetd.yaml

@@ -8,13 +8,13 @@
 password:
 
 # defaults below; uncomment and edit
-#block_pools: [vg-targetd] # just 1 by default, but can be more
-#fs_pools: []
+#block_pools: [vg-targetd/thin_pool] # just 1 by default, but can be more
+#fs_pools: []  # Path to btrfs FS, eg. /my_btrfs_mount
 #user: admin
 #target_name: iqn.2003-01.org.example.mach1:1234
 
 # log level (debug, info, warning, error, critical)
-#log_level = info
+#log_level: info
 
 #ssl: false
 # if ssl is activated:

targetd/nfs.py

@@ -12,7 +12,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
-import hashlib
 import os
 import os.path
 import shlex