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

[pere at users.alioth.debian.org]

Author: pere
Date: Tue Feb 12 08:40:15 2008
New Revision: 605

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=605
Log:
Sync with Werner.

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=605&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Tue Feb 12 08:40:15 2008
@@ -684,7 +684,7 @@
 set -C
 
 # Remove old symlinks
-insserv_remove oldscript
+insserv_del 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=605&op=diff
==============================================================================
--- trunk/src/insserv/debian/testsuite-common (original)
+++ trunk/src/insserv/debian/testsuite-common Tue Feb 12 08:40:15 2008
@@ -85,8 +85,9 @@
     $insserv $debug -c $insconf -p $initddir -o $overridedir $script
 }
 
-insserv_remove() {
-    script=$initddir/$1
+insserv_del ()
+{
+    script=$(printf "${initddir}/%s\n" ${1+"$@"})
     $insserv $debug -c $insconf -p $initddir -o $overridedir -r $script
 }