[Initscripts-ng-commits] r1081 - in /trunk/src/insserv/debian: changelog patches/11_debian_conf.patch run-testsuite

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Sun Nov 18 01:58:04 2012
New Revision: 1081

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1081
Log:
* Add +mountall-bootclean to $local_fs virtual facility definition in
  insserv.conf. (Closes: #693371)
* Add test_bootmisc_order test to suite to verify the mountall-bootclean
  dependency works as expected.

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/11_debian_conf.patch
    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=1081&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Nov 18 01:58:04 2012
@@ -1,3 +1,12 @@
+insserv (1.14.0-5) unstable; urgency=low
+
+  * Add +mountall-bootclean to $local_fs virtual facility definition in
+    insserv.conf. (Closes: #693371)
+  * Add test_bootmisc_order test to suite to verify the mountall-bootclean
+    dependency works as expected.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 18 Nov 2012 11:55:44 +1000
+
 insserv (1.14.0-4) unstable; urgency=low
 
   * Provide machine parseable output which may be used by file-rc to calculate

Modified: trunk/src/insserv/debian/patches/11_debian_conf.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/11_debian_conf.patch?rev=1081&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/11_debian_conf.patch (original)
+++ trunk/src/insserv/debian/patches/11_debian_conf.patch Sun Nov 18 01:58:04 2012
@@ -9,7 +9,7 @@
  # All local filesystems are mounted (done during boot phase)
  #
 -$local_fs	boot.localfs +boot.crypto
-+$local_fs	+mountall +mountoverflowtmp +umountfs
++$local_fs	+mountall +mountall-bootclean +mountoverflowtmp +umountfs
  
  #
  # Low level networking (ethernet card)

Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=1081&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Sun Nov 18 01:58:04 2012
@@ -2356,6 +2356,60 @@
 fi
 
 rm -f ${tmpdir}/rc.conf
+}
+##########################################################################
+test_bootmisc_order() {
+echo
+echo "info: mountall-bootclean.sh must start before bootmisc.sh"
+echo
+
+initdir_purge
+
+set +C
+cat <<'EOF' > $insconf
+$local_fs       +mountall +mountall-bootclean
+$remote_fs      $local_fs
+EOF
+set -C
+
+initdir_purge
+
+insertscript mountall.sh <<'EOF'
+### BEGIN INIT INFO
+# Provides:          mountall
+# Required-Start:
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+EOF
+
+insertscript mountall-bootclean.sh <<'EOF'
+### BEGIN INIT INFO
+# Provides:          mountall-bootclean
+# Required-Start:    mountall
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+EOF
+
+insertscript bootmisc.sh <<'EOF'
+### BEGIN INIT INFO
+# Provides:          bootmisc
+# Required-Start:    $remote_fs
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+EOF
+
+list_rclinks
+
+check_order S mountall.sh mountall-bootclean.sh
+check_order S mountall-bootclean.sh bootmisc.sh
+
+update_conf
 }
 ##########################################################################
 
@@ -2401,3 +2455,4 @@
 test_undetected_loop		# 2 non-fatal tests failing
 test_invalid_core_string
 test_show_all
+test_bootmisc_order