[Pkg-sysvinit-commits] r1054 - in sysvinit/branches/libata-fixes/debian: . initscripts/etc/init.d

[hmh at alioth.debian.org]

Author: hmh
Date: 2007-06-09 13:41:40 +0000 (Sat, 09 Jun 2007)
New Revision: 1054

Modified:
   sysvinit/branches/libata-fixes/debian/changelog
   sysvinit/branches/libata-fixes/debian/initscripts/etc/init.d/halt
Log:
* init.d/halt: do not issue -h to halt(8) when the kernel supports auto-shutdown


Modified: sysvinit/branches/libata-fixes/debian/changelog
===================================================================
--- sysvinit/branches/libata-fixes/debian/changelog	2007-06-09 13:40:46 UTC (rev 1053)
+++ sysvinit/branches/libata-fixes/debian/changelog	2007-06-09 13:41:40 UTC (rev 1054)
@@ -1,3 +1,12 @@
+sysvinit (2.86.ds1-39) UNRELEASED; urgency=low
+
+  * libata shutdown handling fixes:
+    Check http://linux-ata.org/shutdown.html for information
+    * init.d/halt: do not issue -h to halt(8) when the kernel supports
+      auto-shutdown
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org>  Sat,  9 Jun 2007 10:17:38 -0300
+
 sysvinit (2.86.ds1-38) unstable; urgency=medium
 
   * Medium urgency as it solve an RC bug in etch.

Modified: sysvinit/branches/libata-fixes/debian/initscripts/etc/init.d/halt
===================================================================
--- sysvinit/branches/libata-fixes/debian/initscripts/etc/init.d/halt	2007-06-09 13:40:46 UTC (rev 1053)
+++ sysvinit/branches/libata-fixes/debian/initscripts/etc/init.d/halt	2007-06-09 13:41:40 UTC (rev 1054)
@@ -40,9 +40,11 @@
 		/etc/init.d/ups-monitor poweroff
 	fi
 
-	# Don't shut down drives if we're using RAID.
+	# Don't shut down drives if we're using RAID, or if the kernel can
+	# do it properly by itself, see http://linux-ata.org/shutdown.html
 	hddown="-h"
-	if grep -qs '^md.*active' /proc/mdstat
+	if grep -qs '^md.*active' /proc/mdstat || \
+	   ls -1 /sys/class/scsi_disk/*/manage_start_stop >/dev/null 2>&1
 	then
 		hddown=""
 	fi