--- block-iscsi.orig    2016-05-09 15:12:02.489495212 +1000
+++ block-iscsi 2016-05-09 15:16:35.447480532 +1000
@@ -31,16 +31,6 @@
     echo $1 | sed "s/^\("$2"\)//"
 }
 
-check_tools()
-{
-    if ! command -v iscsiadm > /dev/null 2>&1; then
-        fatal "Unable to find iscsiadm tool"
-    fi
-    if [ "$multipath" = "y" ] && ! command -v multipath > /dev/null 2>&1; then
-        fatal "Unable to find multipath"
-    fi
-}
-
 # Sets the following global variables based on the params field passed in as
 # a parameter: iqn, portal, auth_method, user, multipath, password
 parse_target()
@@ -52,12 +42,18 @@
         case $param in
         iqn=*)
             iqn=$(remove_label $param "iqn=")
+            if ! command -v iscsiadm > /dev/null 2>&1; then
+                fatal "Could not find iscsiadm tool."
+            fi
             ;;
         portal=*)
             portal=$(remove_label $param "portal=")
             ;;
         multipath=*)
             multipath=$(remove_label $param "multipath=")
+            if ! command -v multipath > /dev/null 2>&1; then
+                fatal "Multipath selected, but no multipath tools found"
+            fi
             ;;
         esac
     done
@@ -96,40 +92,6 @@
     fi
 }

-# Attaches the target $iqn in $portal and sets $dev to point to the
-# multipath device
-attach()
-{
-    do_or_die iscsiadm -m node --targetname "$iqn" -p "$portal" --login > /dev/null
-    find_device
-}
-
-# Discovers targets in $portal and checks that $iqn is one of those targets
-# Also sets the auth parameters to attach the device
-prepare()
-{
-    # Check if target is already opened
-    iscsiadm -m session 2>&1 | grep -q "$iqn" && fatal "Device already opened"
-    # Discover portal targets
-    iscsiadm -m discovery -t st -p $portal 2>&1 | grep -q "$iqn" || \
-        fatal "No matching target iqn found"
-}
-
-# Attaches the device and writes xenstore backend entries to connect
-# the device
-add()
-{
-    attach
-    write_dev $dev
-}
-
-# Disconnects the device
-remove()
-{
-    find_device
-    do_or_die iscsiadm -m node --targetname "$iqn" -p "$portal" --logout > /dev/null
-}
-
 command=$1
 target=$(xenstore-read $XENBUS_PATH/params || true)
 if [ -z "$target" ]; then
@@ -138,15 +100,21 @@

 parse_target "$target"

-check_tools || exit 1
-
 case $command in
 add)
-    prepare
-    add
+    # Check if target is already opened
+    iscsiadm -m session 2>&1 | grep -q "$iqn" && fatal "Device already opened"
+    # Discover portal targets
+    iscsiadm -m discovery -t st -p $portal 2>&1 | grep -q "$iqn" || \
+        fatal "No matching target iqn found"
+
+    ## Login to the iSCSI target.
+    do_or_die iscsiadm -m node --targetname "$iqn" -p "$portal" --login > /dev/null
+
+    write_dev $dev
     ;;
 remove)
-    remove
+    do_or_die iscsiadm -m node --targetname "$iqn" -p "$portal" --logout > /dev/null
     ;;
 *)
     exit 1