[Pkg-sysvinit-commits] r287 - in sysvinit/trunk/debian: .
initscripts/etc/init.d
Thomas Hood
jdthood-guest at costa.debian.org
Fri Nov 25 19:55:24 UTC 2005
Author: jdthood-guest
Date: 2005-11-25 19:55:23 +0000 (Fri, 25 Nov 2005)
New Revision: 287
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
Log:
Unmount tmpfs before swapoff and other fs's afterwards ; organize changelog
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2005-11-25 19:32:02 UTC (rev 286)
+++ sysvinit/trunk/debian/changelog 2005-11-25 19:55:23 UTC (rev 287)
@@ -7,50 +7,52 @@
remove "exit" from their .sh scripts.
[ Thomas Hood ]
- * *.sh: Fix usage messages
* *.sh: Make sure that these do their thing when they aren't given any
command line arguments (as is the case when they are sourced)
- * checkroot.sh: Fix double printing of 'Done checking root file system';
- mountall.sh: Fix chopped-up printing of mount information
- (Closes: #339979, #331397 and presumably closes: #332309)
- * Save fsck log (Closes: #189356)
- * Improve initscripts' use of log_* functions (Closes: #55143, #323749)
- * There remains the problem that error messages printed by programs
+ * *.sh: Improve use of log_* functions (Closes: #55143, #323749)
+ There remains the problem that error messages printed by programs
that are called by initscripts get printed on the console and thus
mess up single-line-format messages printed by the log_ functions.
I asked at http://lists.debian.org/debian-devel/2005/11/msg01309.html
how this should be dealt with.
- * Eliminate use of dir_writable from checkroot.sh and mountvirtfs in
- order to try to please selinux (Closes: #333836)
- * Improve skeleton initscript
- * Shorten motd header (Closes: #340017)
- * Rotate dmesg log with savelog (Closes: #237074)
- * Depend on debianutils >= 2.13.1 in order to prevent #295850.
- Note that debianutils also has to be >= 2.12.0 so that the "which"
- program is available in /bin.
+ * checkroot.sh: Fix double printing of 'Done checking root file system';
+ mountall.sh: Fix chopped-up printing of mount information
+ (Closes: #339979, #331397 and presumably closes: #332309)
+ * checkroot.sh, checkfs.sh: Save fsck logs (Closes: #189356)
+ * checkroot.sh, mountvirtfs: Eliminate use of dir_writable in order to
+ try to please selinux (Closes: #333836)
+ * bootmisc.sh: Shorten motd header (Closes: #340017)
+ * bootmisc.sh: Rotate dmesg log with savelog (Closes: #237074)
+ * Replace /etc/rc1.d/20single by /etc/rc1.d/S30killprocs and
+ /etc/rc1.d/S99single so that packages can insert scripts to do
+ things between the "killall5" in the former and the "exec init -t1 S"
+ in the latter. This addresses #145280.
+ * umountfs: Unmount tmpfs before swapoff and other fs's afterwards
+ (Closes: #328582, hopefully without reopening #84782)
+ * Make stop-bootlogd a distinct script rather than a symlink to bootlogd.
+ This allows us to give it a different LSB header.
* checkfs.sh: Implement FSCKTYPES (Closes: #89481)
FSCKTYPES="ext2,msdos" to fsck only file system types ext2 and msdos
See fsck(8) for syntax. FSCKTYPES="none" disables fsck of file
systems (other than the root filesystem) altogether.
* Allow VERBOSE to be set via the INIT_VERBOSE=yes kernel argument
(Closes: #286082)
+ * *.sh: Fix usage messages
+ * Improve skeleton initscript
+ * Clean up indentation and formatting of all initscripts
+ * Run stop-bootlogd in runlevel 1 (Closes: #220025)
+ * Make initscripts Depend on debianutils >= 2.13.1 in order to prevent
+ #295850. Note that debianutils also has to be >= 2.12.0 so that the
+ "which" program is available in /bin.
+ * Remove unneeded sysvinit Dependency on coreutils (Closes: #316423)
* pidof: If the program is specified with a path, don't match processes
of programs run from different paths (Closes: #160329)
+ * 40_selinux: Remove extra printf argument
* init.8: Mention that entering runlevel 1 kills all processes
(Closes: #238861)
* update-rc.d.8: Mention that update-rc.d will not create multiple start
or multiple stop symlinks for a service in a single runlevel directory.
(Closes: #330155)
- * Replace /etc/rc1.d/20single by /etc/rc1.d/S30killprocs and
- /etc/rc1.d/S99single so that packages can insert scripts to do
- things between the "killall5" in the former and the "exec init -t1 S"
- in the latter. This addresses #145280.
- * Make stop-bootlogd a distinct script rather than a symlink to bootlogd.
- This allows us to give it a different LSB header.
- * Run stop-bootlogd in runlevel 1 (Closes: #220025)
- * Remove unneeded sysvinit Dependency on coreutils (Closes: #316423)
- * Clean up indentation and formatting of all initscripts
- * 40_selinux: Remove extra printf argument
-- Petter Reinholdtsen <pere at debian.org> Sat, 19 Nov 2005 21:11:34 +0100
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountfs 2005-11-25 19:32:02 UTC (rev 286)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountfs 2005-11-25 19:55:23 UTC (rev 287)
@@ -16,9 +16,19 @@
. /lib/lsb/init-functions
do_stop () {
+ # Make sure tmpfs file systems are umounted before turning off
+ # swap, to avoid running out of memory if the tmpfs filesystems
+ # use a lot of space.
+ log_action_begin_msg "Unmounting temporary filesystems"
+ umount -a -t tmpfs
+ log_action_end_msg $?
+
+ log_action_begin_msg "Deactivating swap"
+ swapoff -a >/dev/null
+ log_action_end_msg $?
+
# Umount all filesystems except root and the virtual ones
log_action_begin_msg "Unmounting local filesystems"
-
# List all mounts, deepest mount point first
LANG=C sort -r -k 2 /etc/mtab |
(
@@ -39,13 +49,6 @@
umount -r -d $DIRS
)
log_action_end_msg $?
-
- # Make sure tmpfs file systems are umounted before turning off
- # swap, to avoid running out of memory if the tmpfs filesystems
- # use a lot of space.
- log_action_begin_msg "Deactivating swap"
- swapoff -a
- log_action_end_msg $?
}
case "$1" in
More information about the Pkg-sysvinit-commits
mailing list