[Pkg-sysvinit-commits] r621 - in sysvinit/trunk/debian: .
initscripts/etc/init.d
Thomas Hood
jdthood-guest at costa.debian.org
Thu Jan 12 10:25:17 UTC 2006
Author: jdthood-guest
Date: 2006-01-12 10:25:16 +0000 (Thu, 12 Jan 2006)
New Revision: 621
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
Log:
Update changelog; choose safer function names than 'do_mount' given that we also have a domount() function
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2006-01-12 10:07:56 UTC (rev 620)
+++ sysvinit/trunk/debian/changelog 2006-01-12 10:25:16 UTC (rev 621)
@@ -5,20 +5,21 @@
* bootclean: Adapt from old bootclean.sh; handle return status more
carefully; print diagnostic messages on failures; eliminate use of
subshells; add comments
- * umountnfs.sh: Eliminate unnecessary use of subshell
+ * mountnfs.sh, mountall.sh: Choose different names for intnl. functions
+ * various scripts: Make more messages depend on VERBOSE being != no
+ * various scripts: Handle return status more carefully
+ * various scripts: Eliminate unnecessary uses of subshell
+ * mountvirtfs -> mountkernfs.sh; mountdevsubfs -> mountdevsubfs.sh;
+ mountvirtfs now calls the above two (for backward compatibility);
+ mtab.sh now runs mountkernfs.sh and mountdevsubfs.sh to update
+ the mtab file after mountall.sh.
+ * /etc/init.d/rc: Restore PATH after sourcing an initscript
* debian/rules:
+ Use ':', not the deprecated '.' between owner and group names
in chown commands
+ Use '-o root' with install
- * Complete the split of mountdevsubfs out of mountvirtfs
* /etc/init.d/README: Note that /etc/init.d/*.sh must have '#!/bin/sh'
and must follow policy 10.4.
- * mountvirtfs -> mountkernfs.sh; mountdevsubfs -> mountdevsubfs.sh;
- mountvirtfs now calls the above two (for backward compatibility);
- mtab.sh now runs mountkernfs.sh and mountdevsubfs.sh to update
- the mtab file after mountall.sh.
- * /etc/init.d/rc: Restore PATH after sourcing an initscript
- * Make more messages depend on VERBOSE being != no
[ Ubuntu backports by T.H. ]
* During shutdown and reboot take the progress bar from 100 to 0
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh 2006-01-12 10:07:56 UTC (rev 620)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh 2006-01-12 10:25:16 UTC (rev 621)
@@ -29,12 +29,12 @@
# E.g., usually the proc filesystem is already mounted when
# this script runs.
- do_mount() { mount -av -t nonfs,nonfs4,nosmbfs,nocifs,noncp,noncpfs,nocoda,noocfs2,nogfs ; }
+ mount_all() { mount -av -t nonfs,nonfs4,nosmbfs,nocifs,noncp,noncpfs,nocoda,noocfs2,nogfs ; }
if [ "$VERBOSE" != no ]
then
log_action_msg "Will now mount local filesystems"
- do_mount
+ mount_all
ES=$?
if [ 0 = "$ES" ] || [ 96 = "$ES" ] || [ 64 = "$ES" ]
then
@@ -44,7 +44,7 @@
fi
else
log_action_begin_msg "Mounting local filesystems"
- MOUNT_OUT="$(LC_ALL=C do_mount)"
+ MOUNT_OUT="$(LC_ALL=C mount_all)"
ES=$?
echo "$MOUNT_OUT" | sed -e '/already mounted/d' -e '/nothing was mounted/d'
if [ 0 = "$ES" ] || [ 96 = "$ES" ] || [ 64 = "$ES" ]
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh 2006-01-12 10:07:56 UTC (rev 620)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh 2006-01-12 10:25:16 UTC (rev 621)
@@ -97,7 +97,7 @@
if [ "$NETFS" ]
then
- do_mount() { mount -a -t$NETFS ; }
+ mount_all_nfs() { mount -a -t$NETFS ; }
# Accept 64 or 96 (32/mount failure + 64/some mount succeeded)
# as valid return statuses from mount. This partly works around
@@ -107,7 +107,7 @@
if [ "$VERBOSE" != no ]
then
log_action_msg "Will now mount remote filesystems"
- do_mount
+ mount_all_nfs
ES=$?
if [ 0 = "$ES" ] || [ 96 = "$ES" ] || [ 64 = "$ES" ]
then
@@ -117,7 +117,7 @@
fi
else
log_action_begin_msg "Mounting remote filesystems"
- MOUNT_OUT="$(LC_ALL=C do_mount)"
+ MOUNT_OUT="$(LC_ALL=C mount_all_nfs)"
ES=$?
echo "$MOUNT_OUT" | sed -e '/already mounted/d' -e '/nothing was mounted/d'
if [ 0 = "$ES" ] || [ 96 = "$ES" ] || [ 64 = "$ES" ]
More information about the Pkg-sysvinit-commits
mailing list