[Pkg-sysvinit-commits] r669 -
sysvinit/trunk/debian/initscripts/etc/init.d
Thomas Hood
jdthood-guest at costa.debian.org
Tue Jan 17 18:30:42 UTC 2006
Author: jdthood-guest
Date: 2006-01-17 18:30:42 +0000 (Tue, 17 Jan 2006)
New Revision: 669
Modified:
sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
Log:
Add -v option to swapon when VERBOSE is not 'no'
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh 2006-01-17 18:24:05 UTC (rev 668)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh 2006-01-17 18:30:42 UTC (rev 669)
@@ -135,7 +135,7 @@
log_action_end_msg $?
else
log_action_msg "Will now activate swap"
- swapon -a
+ swapon -a -v
ES=$?
if [ "$ES" = 0 ]
then
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh 2006-01-17 18:24:05 UTC (rev 668)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh 2006-01-17 18:30:42 UTC (rev 669)
@@ -80,10 +80,15 @@
# Execute swapon command again, in case we want to swap to
# a file on a now mounted filesystem.
#
- [ "$VERBOSE" = no ] || log_action_begin_msg "Activating swapfile swap"
- swapon -a -e 2>/dev/null # Stifle "Device or resource busy"
- # Ignore 255 status
- [ "$VERBOSE" = no ] || log_action_end_msg 0
+ if [ "$VERBOSE" = no ]
+ then
+ swapon -a -e 2>/dev/null || : # Stifle "Device or resource busy"
+ else
+ log_action_begin_msg "Activating swapfile swap"
+ swapon -a -e -v || :
+ # Ignore 255 status
+ log_action_end_msg 0
+ fi
}
case "$1" in
More information about the Pkg-sysvinit-commits
mailing list