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

[pere at users.alioth.debian.org]

Author: pere
Date: Sat Dec 29 22:56:41 2007
New Revision: 334

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=334
Log:
Improve script names, and add test to see if there is a difference between depending on local and remote file systems.

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=334&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Sat Dec 29 22:56:41 2007
@@ -23,7 +23,7 @@
     runlevel=$1
     script1=$2
     script2=$3
-    order="$(echo $(cd $tmpdir/rc$runlevel.d/; ls *$script1 *$script2 | sed 's/[SK]..//') )"
+    order="$(echo $(cd $tmpdir/rc$runlevel.d/; ls *$script1 *$script2 2>/dev/null | sed 's/[SK]..//') )"
     if [ "$order" != "$script1 $script2" ] ; then
 	echo "error: incorrect $runlevel sequence $script1 not before $script2"
 	retval=1
@@ -173,9 +173,19 @@
 ### END INIT INFO
 EOF
 
-insertscript daemon <<'EOF'
-#### BEGIN INIT INFO
-# Provides:          daemon
+insertscript needlocalfs <<'EOF'
+#### BEGIN INIT INFO
+# Provides:          needlocalfs
+# Required-Start:    $local_fs
+# Required-Stop:     $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+### END INIT INFO
+EOF
+
+insertscript needallfs <<'EOF'
+#### BEGIN INIT INFO
+# Provides:          needallfs
 # Required-Start:    $remote_fs
 # Required-Stop:     $remote_fs
 # Default-Start:     2 3 4 5
@@ -246,13 +256,17 @@
 check_order S mountall.sh beforenfs
 check_order S beforenfs mountnfs.sh
 
-check_order 0 daemon umountnfs
+check_order 0 needallfs umountnfs
 check_order 0 umountroot halt
 
 check_order 1 killprocs single
-check_order 1 daemon killprocs
-
-check_order 6 daemon umountnfs
+check_order 1 needallfs killprocs
+
+check_order 2 needlocalfs needallfs
+check_order 2 needlocalfs nolsbheader
+
+check_order 6 needallfs umountnfs
+check_order 6 nolsbheader umountnfs
 check_order 6 umountfs umountroot
 check_order 6 umountnfs umountfs