preliminary spc4r21 sync, manpages for extended scsi_start and scsi_stop

git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@291 6180dd3e-e324-4e3e-922d-17de1ae2f315

4 files changed, 39 insertions, 21 deletions

diff --git a/scripts/README b/scripts/README
index 3fc79a32..08ac35c6 100644
--- a/scripts/README
+++ b/scripts/README
@@ -26,11 +26,11 @@ information. Following is a usage summary with a one line description:
         - fetch capacity/size information for each <device>
    scsi_ready [-h] [-v] <device>+
         - check the media ready status on each <device>
-   scsi_satl [-h] [-L] [-q] <device>
+   scsi_satl [-h] [-L] [-q] [-v] <device>
         - check <device> for SCSI to ATA Translation Layer (SATL)
-   scsi_start [-h] [-v] <device>+
+   scsi_start [-h] [-v] [-w] <device>+
         - start media (i.e. spin up) in each <device>
-   scsi_stop [-h] [-v] <device>+
+   scsi_stop [-h] [-v] [-w] <device>+
         - stop media (i.e. spin down) in each <device>
    scsi_temperature [-h] [-v] <device>+
         - check temperature in each <device>
@@ -43,4 +43,4 @@ script. Since it depends on the sdparm utility it has been moved to
 the sdparm package in its scripts directory.
 
 Douglas Gilbert
-15th August 2009
+25th August 2009
diff --git a/scripts/scsi_satl b/scripts/scsi_satl
index 2bbdf195..12b4c10a 100755
--- a/scripts/scsi_satl
+++ b/scripts/scsi_satl
@@ -24,11 +24,12 @@
 # This script uses utilities from sg3_utils package (version
 # 1.22 or later) and sdparm (version 0.99 or later)
 #
-# Douglas Gilbert 20080328
+# Douglas Gilbert 20090815
 
 
-quiet=0
 log=0
+quiet=0
+verbose=""
 
 file_err=0
 inv_opcode=0
@@ -47,10 +48,11 @@ total_err=0
 
 usage()
 {
-  echo "Usage: scsi_satl [-h] [-L] [-q] <device>"
+  echo "Usage: scsi_satl [-h] [-L] [-q] [-v] <device>"
   echo "  where:  -h, --help       print usage message"
   echo "          -L, --log        append stderr to 'scsi_satl.err'"
   echo "          -q, --quiet      suppress some output"
+  echo "          -v, --verbose    more verbose output"
   echo ""
   echo "Check <device> for SCSI to ATA Translation Layer (SATL) support"
 }
@@ -71,6 +73,7 @@ while test ! -z "$opt" -a -z "${opt##-*}"; do
     h|-help) usage ; exit 1 ;;
     L|-log) let log=$log+1 ;;
     q|-quiet) let quiet=$quiet+1 ;;
+    v|-verbose) verbose="-v" ;;
     *) echo "Unknown option: -$opt " ; exit 1 ;;
   esac
   shift
@@ -87,9 +90,14 @@ do
 
   if [ $log -eq 0 ]
   then
-    $command $1 > /dev/null 2>> /dev/null
+    if [ $verbose ]
+    then
+      $command $verbose $1 > /dev/null
+    else
+      $command $1 > /dev/null 2>> /dev/null
+    fi
   else
-    $command $1 > /dev/null 2>> scsi_satl.err
+    $command $verbose $1 > /dev/null 2>> scsi_satl.err
   fi
   res=$?
   case "$res" in
diff --git a/scripts/scsi_start b/scripts/scsi_start
index 226e9f2a..cad370a5 100755
--- a/scripts/scsi_start
+++ b/scripts/scsi_start
@@ -5,22 +5,26 @@
 #  Spin up the given SCSI disk(s).
 #
 #  SCSI disks (or disks that understand SCSI commands)
-#  are assumed. The immediate bit is set so the command
-#  should return immediately. The disk however will take
-#  10 seconds or more to spin up.
+#  are assumed. By default, the immediate bit is set so the
+#  command should return immediately. The disk however will
+#  take 10 seconds or more to spin up. The '-w' option
+#  causes each start to wait until the disk reports that it
+#  has started.
 #
 #  This script assumes the sg3_utils package is installed.
 #
 ###############################################
 
 verbose=""
+immediate="-i"
 
 usage()
 {
-  echo "Usage: scsi_start [-h] [-v] <device>+"
+  echo "Usage: scsi_start [-h] [-v] [-w] <device>+"
   echo "  where:"
   echo "    -h, --help           print usage message"
   echo "    -v, --verbose        more verbose output"
+  echo "    -w, --wait           wait for each start to complete"
   echo ""
   echo "Send SCSI START STOP UNIT command to start each <device>"
 }
@@ -37,6 +41,7 @@ while test ! -z "$opt" -a -z "${opt##-*}"; do
   case "$opt" in
     h|-help) usage ; exit 0 ;;
     v|-verbose) verbose="-v" ;;
+    w|-wait) immediate="" ;;
     *) echo "Unknown option: -$opt " ; exit 1 ;;
   esac
   shift
@@ -45,6 +50,6 @@ done
 
 for i
 do
-	echo "sg_start -i 1 $verbose $i"
-        sg_start -i 1 $verbose $i
+	echo "sg_start $immediate 1 $verbose $i"
+        sg_start $immediate 1 $verbose $i
 done
diff --git a/scripts/scsi_stop b/scripts/scsi_stop
index c719ab30..a106c206 100755
--- a/scripts/scsi_stop
+++ b/scripts/scsi_stop
@@ -5,22 +5,26 @@
 #  Spin down the given SCS disk(s).
 #
 #  SCSI disks (or disks that understand SCSI commands)
-#  are assumed. The immediate bit is set so the command
-#  should return immediately. The disk however will take
-#  10 seconds or more to spin down.
+#  are assumed. By default, the immediate bit is set so the
+#  command should return immediately. The disk however will
+#  take 10 seconds or more to spin down. The '-w' option
+#  causes each stop to wait until the disk reports that it
+#  has stopped.
 #
 #  This script assumes the sg3_utils package is installed.
 #
 ###############################################
 
 verbose=""
+immediate="-i"
 
 usage()
 {
-  echo "Usage: scsi_stop [-h] [-v] <device>+"
+  echo "Usage: scsi_stop [-h] [-v] [-w] <device>+"
   echo "  where:"
   echo "    -h, --help           print usage message"
   echo "    -v, --verbose        more verbose output"
+  echo "    -w, --wait           wait for each stop to complete"
   echo ""
   echo "Send SCSI START STOP UNIT command to stop each <device>"
 }
@@ -37,6 +41,7 @@ while test ! -z "$opt" -a -z "${opt##-*}"; do
   case "$opt" in
     h|-help) usage ; exit 0 ;;
     v|-verbose) verbose="-v" ;;
+    w|-wait) immediate="" ;;
     *) echo "Unknown option: -$opt " ; exit 1 ;;
   esac
   shift
@@ -45,6 +50,6 @@ done
 
 for i
 do
-        echo "sg_start -i 0 $verbose $i"
-        sg_start -i 0 $verbose $i
+        echo "sg_start $immediate 0 $verbose $i"
+        sg_start $immediate 0 $verbose $i
 done