[Pkg-sysvinit-commits] r1067 - in sysvinit/trunk/debian: . initscripts/etc/default initscripts/etc/init.d initscripts/man
pere at alioth.debian.org
pere at alioth.debian.org
Sun Nov 18 23:37:42 UTC 2007
Author: pere
Date: 2007-11-18 23:37:42 +0000 (Sun, 18 Nov 2007)
New Revision: 1067
Added:
sysvinit/trunk/debian/initscripts/man/halt.5
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/initscripts/etc/default/halt
sysvinit/trunk/debian/initscripts/etc/init.d/halt
sysvinit/trunk/debian/rules
Log:
Merge changes 1051:1056 from the libata-fixes branch.
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2007-11-18 23:20:05 UTC (rev 1066)
+++ sysvinit/trunk/debian/changelog 2007-11-18 23:37:42 UTC (rev 1067)
@@ -1,5 +1,6 @@
sysvinit (2.86.ds1-39) UNRELEASED; urgency=medium
+ [ Petter Reinholdtsen ]
* Change checkfs.sh dependency info, make modutils an optional
dependency as it is no longer installed by default.
* Move /etc/init.d/bootclean to /lib/init/bootclean, as it is not an
@@ -22,6 +23,16 @@
with regard to initscripts dependencies on lpia. Patch from Adam
Conrad in Ubuntu.
+ [ Henrique de Moraes Holschuh ]
+ * 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
+ * init.d/halt, default/halt: add HDDOWN option to override initscript
+ halt -h logic
+ * Add halt(5) manpage, updated for HDDOWN. Thanks to Casper Gielen for
+ the manpage. (Closes: #407211)
+
-- Petter Reinholdtsen <pere at debian.org> Tue, 30 Jan 2007 23:14:04 +0100
sysvinit (2.86.ds1-38.1) unstable; urgency=low
Modified: sysvinit/trunk/debian/initscripts/etc/default/halt
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/default/halt 2007-11-18 23:20:05 UTC (rev 1066)
+++ sysvinit/trunk/debian/initscripts/etc/default/halt 2007-11-18 23:37:42 UTC (rev 1067)
@@ -1,2 +1,12 @@
# Default behaviour of shutdown -h / halt. Set to "halt" or "poweroff".
HALT=poweroff
+
+# Should we try to spin down disks? Note that a new enough kernel can override
+# this, and that disks are best spun down by the kernel, not by halt(8).
+# See http://linux-ata.org/shutdown.html
+#
+# Set HDDOWN to "NEVER" to not use the -h halt(8) option, or to "ALWAYS" to
+# always use the -h halt(8) option. Leave it undefined to let the initscript
+# decide for itself.
+#HDDOWN=NEVER
+#HDDOWN=ALWAYS
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/halt
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/halt 2007-11-18 23:20:05 UTC (rev 1066)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/halt 2007-11-18 23:37:42 UTC (rev 1067)
@@ -40,12 +40,19 @@
/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
+ #
+ # Allow the user to override it in the default file, however
hddown="-h"
- if grep -qs '^md.*active' /proc/mdstat
+ if [ "$HDDOWN" = "NEVER" ] || grep -qs '^md.*active' /proc/mdstat || \
+ ls -1 /sys/class/scsi_disk/*/manage_start_stop >/dev/null 2>&1
then
hddown=""
fi
+ if [ "$HDDOWN" = "ALWAYS" ]; then
+ hddown="-h"
+ fi
# If INIT_HALT=HALT don't poweroff.
poweroff="-p"
Added: sysvinit/trunk/debian/initscripts/man/halt.5
===================================================================
--- sysvinit/trunk/debian/initscripts/man/halt.5 (rev 0)
+++ sysvinit/trunk/debian/initscripts/man/halt.5 2007-11-18 23:37:42 UTC (rev 1067)
@@ -0,0 +1,58 @@
+.TH halt 5 "16 Jan 2007" "" "File Formats"
+.SH NAME
+halt \- variables that affect the behavior of the shutdown scripts
+.SH DESCRIPTION
+The
+.I /etc/default/halt
+file contains variable settings in POSIX format:
+.IP "" .5i
+VAR=VAL
+.PP
+Only one assignment is allowed per line.
+Comments (starting with '#') are also allowed.
+
+.SH OPTIONS
+The following variables can be set.
+
+.IP \fBHALT\fP
+If set to
+.B poweroff
+the system will be powered down after it has been
+brought down. This is the default.
+.br
+If set to
+.B halt
+the system will only be halted after it has been brought
+down. What exactly this means depends on your hardware.
+
+.IP \fBNETDOWN\fB
+Setting this to
+.B no
+prevents shutdown from shutting down the network intefaces.
+This is necessary to use Wake-On-Lan.
+Setting it to
+.B yes
+causes shutdown to also bring down the network interfaces (and
+thus prevent the machine from being woken up remotely).
+
+.IP \fBHDDOWN\fB
+Setting this to
+.B NEVER
+prevents /etc/init.d/halt from issuing halt -h.
+Setting it to
+.B ALWAYS
+makes /etc/init.d/halt always issue halt -h.
+Leave it undefined to let the initscript decide by itself.
+
+.SH SEE ALSO
+.BR halt "(8), " shutdown "(8)."
+
+.SH AUTHOR
+\fBCasper Gielen\fR <\&casper at gielen.name\&>
+
+.SH "COPYRIGHT"
+This manual page is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+.PP
+This manual page is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+.PP
+You should have received a copy of the GNU General Public License along with this manual page; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111\-1307 USA
Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules 2007-11-18 23:20:05 UTC (rev 1066)
+++ sysvinit/trunk/debian/rules 2007-11-18 23:37:42 UTC (rev 1067)
@@ -202,6 +202,8 @@
$(tmp)/sbin/fsck.nfs
install -o root -g root -m 644 debian/initscripts/man/fsck.nfs.8 \
$(tmp)/usr/share/man/man8/fsck.nfs.8
+ install -o root -g root -m 644 debian/initscripts/man/halt.5 \
+ $(tmp)/usr/share/man/man5/halt.5
install -o root -g root -m 644 debian/initscripts/rcS.5 \
$(tmp)/usr/share/man/man5
install -o root -g root -m 755 src/mountpoint $(tmp)/bin
More information about the Pkg-sysvinit-commits
mailing list