[Pkg-sysvinit-devel] Bug#339949: checkroot.sh: calling mountvirtfs fails

[Brendan O'Dea]

Package: initscripts
Version: 2.86.ds1-5
Tags: patch

Sun Nov 20 07:34:27 2005: Activating swap...
Sun Nov 20 07:34:27 2005: .
Sun Nov 20 07:34:27 2005: Checking root file system....
Sun Nov 20 07:34:27 2005: Usage: /etc/rcS.d/S10checkroot.sh start|stop|restart|reload|force-reload

The usage message is actually coming from /etc/init.d/mountvirtfs (which
I suspect was changed to require an argument: #338736).

Another minor issue is that "Activating swap..." should probably use
log_begin_msg rather than log_success_message.

--bod

--- checkroot.sh.orig	2005-11-20 07:50:36.000000000 +1100
+++ checkroot.sh	2005-11-20 07:49:55.000000000 +1100
@@ -133,7 +133,7 @@
 	esac
 	if [ "$doswap" = yes ]
 	then
-		[ "$VERBOSE" != no ] && log_success_msg "Activating swap..."
+		[ "$VERBOSE" != no ] && log_begin_msg "Activating swap..."
 		swapon -a 2> /dev/null
 		[ "$VERBOSE" != no ] && log_end_msg $?
 	fi
@@ -348,7 +348,7 @@
 		[ "$roottype" != none ] &&
 			mount -f -o $rootopts -t $roottype $fstabroot /
 		[ -n "$devfs" ] && mount -f $devfs
-		. /etc/init.d/mountvirtfs
+		. /etc/init.d/mountvirtfs start
 	fi
 
 	#