[Initscripts-ng-commits] r324 - /trunk/src/insserv/debian/run-testsuite

[pere at users.alioth.debian.org]

Author: pere
Date: Sat Dec 29 15:58:53 2007
New Revision: 324

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=324
Log:
More checks, and improve output.

Modified:
    trunk/src/insserv/debian/run-testsuite

Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=324&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Sat Dec 29 15:58:53 2007
@@ -24,7 +24,7 @@
     script2=$3
     order="$(echo $(cd $tmpdir/rc$runlevel.d/; ls *$script1 *$script2 | sed 's/[SK]..//') )"
     if [ "$order" != "$script1 $script2" ] ; then
-	echo "error: Incorrect $runlevel sequence $script1 not before $script2: $order"
+	echo "error: incorrect $runlevel sequence $script1 not before $script2"
 	retval=1
     fi
 }
@@ -150,6 +150,16 @@
 ### END INIT INFO
 EOF
 
+insertscript halt <<EOF
+### BEGIN INIT INFO
+# Provides:          halt
+# Required-Start:
+# Required-Stop:
+# Default-Start:
+# Default-Stop:      0
+### END INIT INFO
+EOF
+
 insertscript umountroot <<EOF
 ### BEGIN INIT INFO
 # Provides:          umountroot
@@ -191,12 +201,16 @@
 check_order S ifupdown-clean ifupdown
 check_order S mountall.sh mountnfs.sh
 
+check_order 0 daemon umountnfs
+check_order 0 umountroot halt
+
 check_order 6 daemon umountnfs
 check_order 6 umountfs umountroot
+check_order 6 umountnfs umountfs
 
 rm -rf $tmpdir
 
 if [ 0 != $retval ] ; then
-    echo "error: One or more test failed."
+    echo "error: one or more test failed."
 fi
 exit $retval