[Initscripts-ng-commits] r604 - in /trunk/src/insserv/debian: run-testsuite testsuite-common

[pere at users.alioth.debian.org]

Author: pere
Date: Mon Feb 11 14:47:25 2008
New Revision: 604

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=604
Log:
Drop override functions and add new function insserv_remove().

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

Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=604&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Mon Feb 11 14:47:25 2008
@@ -8,21 +8,6 @@
 else
     severity=test
 fi
-
-runlevel_path() {
-    runlevel=$1
-    echo $initddir/../rc$runlevel.d/
-}
-
-list_rclinks() {
-    (cd $initddir/../. && ls *)
-}
-
-insserv_reg() {
-    script=$initddir/$1
-    shift
-    $insserv $debug -c $insconf -p $initddir -o $overridedir $@ $script
-}
 
 update_conf() {
 set +C
@@ -699,7 +684,7 @@
 set -C
 
 # Remove old symlinks
-insserv_reg oldscript -r
+insserv_remove oldscript
 # Insert new ones, this time without runlevel 0 and 6
 insserv_reg oldscript
 

Modified: trunk/src/insserv/debian/testsuite-common
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/testsuite-common?rev=604&op=diff
==============================================================================
--- trunk/src/insserv/debian/testsuite-common (original)
+++ trunk/src/insserv/debian/testsuite-common Mon Feb 11 14:47:25 2008
@@ -83,6 +83,11 @@
 {
     script=$(printf "${initddir}/%s\n" ${1+"$@"})
     $insserv $debug -c $insconf -p $initddir -o $overridedir $script
+}
+
+insserv_remove() {
+    script=$initddir/$1
+    $insserv $debug -c $insconf -p $initddir -o $overridedir -r $script
 }
 
 relpath ()