[Initscripts-ng-commits] r923 - in /trunk/src/insserv/debian: changelog run-testsuite

[pere at users.alioth.debian.org]

Author: pere
Date: Tue Jul 21 22:03:15 2009
New Revision: 923

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=923
Log:
Simplify test for bug #534526, while still triggering the bug.

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

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=923&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Tue Jul 21 22:03:15 2009
@@ -2,6 +2,7 @@
 
   [ Petter Reinholdtsen ]
   * Refresh 92_m68k_alignment.patch.
+  * Simplify test for bug #534526, while still triggering the bug.
 
   [ Kel Modderman ]
   * Before inserting an initscript with insserv, check that

Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=923&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Tue Jul 21 22:03:15 2009
@@ -1869,7 +1869,7 @@
 set +C
 cat <<'EOF' > $insconf
 $local_fs       +mountall +nonexisting
-$remote_fs      $local_fs +mountnfs
+$remote_fs      $local_fs
 EOF
 set -C
 
@@ -1877,16 +1877,6 @@
 ### BEGIN INIT INFO
 # Provides:          mountall
 # Required-Start:
-# Required-Stop:
-# Default-Start:     1
-# Default-Stop:
-### END INIT INFO
-EOF
-
-insertscript mountnfs <<'EOF'
-### BEGIN INIT INFO
-# Provides:          mountnfs
-# Required-Start:    $local_fs
 # Required-Stop:
 # Default-Start:     1
 # Default-Stop:
@@ -1915,8 +1905,8 @@
 
 list_rclinks
 
-if ! grep -q "^hal: mountall mountnfs dbus" ${initddir}/.depend.start ; then
-    msg="hal should depend on dbus, mountall and mountnfs in .depend.start:"
+if ! grep -q "^hal: mountall dbus" ${initddir}/.depend.start ; then
+    msg="hal should depend on dbus and mountall in .depend.start:"
     if [ test = "$severity" ] ; then
         warning "$msg"
     else