add STANDBY_DRIVE config

diff --git a/chiark-cryptdisk/config b/chiark-cryptdisk/config
index 069bf8e..ffbeb07 100644 (file)
--- a/chiark-cryptdisk/config
+++ b/chiark-cryptdisk/config
@@ -7,7 +7,8 @@ NO_RMMOD=1
 # TODO: Make me debconf'ed?
 MAILTO=root@localhost
 
-# Do we want to send the drive to sleep when we're finished?
+# Do we want to send the drive to standby or to sleep when we're finished?
+STANDBY_DRIVE=yes
 SLEEP_DRIVE=no
 
 # Do we want to try to fsck on mount? Usually you do.

diff --git a/chiark-cryptdisk/unmount b/chiark-cryptdisk/unmount
index e71767d..024b1fe 100755 (executable)
--- a/chiark-cryptdisk/unmount
+++ b/chiark-cryptdisk/unmount
@@ -25,6 +25,10 @@ fi
 
 /sbin/hdparm -qf /dev/$dev
 
+if [ "x${STANDBY_DRIVE}" = "xy" ] || [ "x${STANDBY_DRIVE}" = "xyes" ]; then
+       /sbin/hdparm -qy /dev/$dev
+fi
+
 if [ "x${SLEEP_DRIVE}" = "xy" ] || [ "x${SLEEP_DRIVE}" = "xyes" ]; then
        /sbin/hdparm -qY /dev/$dev
 fi

diff --git a/debian/changelog b/debian/changelog
index 73371dd..ff3bfa6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
 chiark-cryptdisk (0.2.1) unstable; urgency=low
 
   * search-for-sata: Add logic to detect and cope with 2.6.32-style sysfs. 
-  * config: add SLEEP_DRIVE param
-  * unmount: hdparm -Y only if SLEEP_DRIVE == "y" or "yes". 
+  * config: add STANDBY_DRIVE and SLEEP_DRIVE param
+  * unmount: hdparm -Y only if SLEEP_DRIVE == "y" or "yes". hdparm -y if
+  STANDBY_DRIVE == y or yes.
   * config: add FSCK_ON_MOUNT option
 
- -- Ross Younger <wry-deb@impropriety.org.uk>  Sun, 20 Jun 2010 09:53:40 +0100
+ -- Ross Younger <wry-deb@impropriety.org.uk>  Sun, 20 Jun 2010 10:02:11 +0100
 
 chiark-cryptdisk (0.2) unstable; urgency=low