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

[pere at users.alioth.debian.org]

Author: pere
Date: Thu Jun 25 21:39:43 2009
New Revision: 897

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=897
Log:
Add testcase for incomplete .depend.boot file based on test
created by Raphael Geissert for bug #534526.

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=897&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Thu Jun 25 21:39:43 2009
@@ -9,6 +9,8 @@
     it is working.
   * Add DM-Upload-Allowed: yes header to allow my co-maintainer to
     upload this package.
+  * Add testcase for incomplete .depend.boot file based on test
+    created by Raphael Geissert for bug #534526.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 24 Jun 2009 08:19:19 +0200
 

Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=897&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Thu Jun 25 21:39:43 2009
@@ -1854,7 +1854,75 @@
 }
 ##########################################################################
 
+test_insserv_conf_makefile() {
+echo
+echo "info: test how recursive /etc/insserv.conf settings show up"
+echo "info: in .depend.start.  BTS #534526."
+echo
+
+initdir_purge
+
+list_rclinks
+
+set +C
+cat <<'EOF' > $insconf
+$local_fs       +mountall +mountoverflowtmp +umountfs
+$remote_fs      $local_fs +mountnfs
+EOF
+set -C
+
+insertscript mountall <<'EOF'
+### BEGIN INIT INFO
+# Provides:          mountall
+# Required-Start:
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:      0 6
+### END INIT INFO
+EOF
+
+insertscript mountnfs <<'EOF'
+### BEGIN INIT INFO
+# Provides:          mountnfs
+# Required-Start:    $local_fs
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:      0 6
+### END INIT INFO
+EOF
+
+insertscript dbus <<'EOF'
+### BEGIN INIT INFO
+# Provides:          dbus
+# Required-Start:
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:      0 6
+### END INIT INFO
+EOF
+
+insertscript hal <<'EOF'
+### BEGIN INIT INFO
+# Provides:          hal
+# Required-Start:    $remote_fs dbus
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:      0 6
+### END INIT INFO
+EOF
+
+list_rclinks
+
+if ! grep -q "^hal: dbus mountall" ${initddir}/.depend.boot ; then
+    error "hal should depend on dbus, mountall and mountnfs in .depend.boot:"
+    grep  "^hal: " ${initddir}/.depend.boot | sed 's/^/  /'
+fi
+
 update_conf
+}
+
+#########################
+
 test_normal_sequence
 test_override_files
 test_override_loop
@@ -1889,3 +1957,4 @@
 test_early_all
 test_script_in_runlevel
 test_x_interactive
+test_insserv_conf_makefile