diff --git a/branches/ucs-3.0/ucs/base/univention-debmirror/debian/postinst b/branches/ucs-3.0/ucs/base/univention-debmirror/debian/postinst
index 92ae26b..ef7c00a 100644
--- a/branches/ucs-3.0/ucs/base/univention-debmirror/debian/postinst
+++ b/branches/ucs-3.0/ucs/base/univention-debmirror/debian/postinst
@@ -44,6 +44,6 @@ fi
 call_joinscript 77univention-debmirror.inst
 
 a2ensite univention-repository
-/etc/init.d/apache2 reload || true
+invoke-rc.d apache2 reload || true
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/base/univention-heimdal/conffiles/etc/init.d/heimdal-kdc b/branches/ucs-3.0/ucs/base/univention-heimdal/conffiles/etc/init.d/heimdal-kdc
index 49b1af6..f733315 100755
--- a/branches/ucs-3.0/ucs/base/univention-heimdal/conffiles/etc/init.d/heimdal-kdc
+++ b/branches/ucs-3.0/ucs/base/univention-heimdal/conffiles/etc/init.d/heimdal-kdc
@@ -119,9 +119,9 @@ case "$1" in
 	#	option to the "reload" entry above. If not, "force-reload" is
 	#	just the same as "restart".
 	#
-	/etc/init.d/heimdal-kdc stop
+	invoke-rc.d heimdal-kdc stop
 	sleep 1
-	/etc/init.d/heimdal-kdc start
+	invoke-rc.d heimdal-kdc start
 	;;
   *)
 	N=/etc/init.d/$NAME
diff --git a/branches/ucs-3.0/ucs/base/univention-heimdal/debian/univention-heimdal-kdc.postinst b/branches/ucs-3.0/ucs/base/univention-heimdal/debian/univention-heimdal-kdc.postinst
index ee0811d..1a5d3cf 100644
--- a/branches/ucs-3.0/ucs/base/univention-heimdal/debian/univention-heimdal-kdc.postinst
+++ b/branches/ucs-3.0/ucs/base/univention-heimdal/debian/univention-heimdal-kdc.postinst
@@ -65,7 +65,7 @@ for fn in kdc.conf kadmind.acl ; do
 done
 
 if [ "$1" = "configure" -a -n "$2" ]; then
-	/etc/init.d/heimdal-kdc restart
+	invoke-rc.d heimdal-kdc restart
 fi
 
 univention-config-registry set kerberos/password/quality/check?yes
@@ -84,7 +84,7 @@ fi
 if [ "$1" = "configure" ]; then
 	if test -f /etc/init.d/univention-directory-listener
 		then
-		/etc/init.d/univention-directory-listener crestart
+		invoke-rc.d univention-directory-listener crestart
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/base/univention-installer/scripts/28_postconfigure_config_registry.sh b/branches/ucs-3.0/ucs/base/univention-installer/scripts/28_postconfigure_config_registry.sh
index a16aed0..81a18e0 100755
--- a/branches/ucs-3.0/ucs/base/univention-installer/scripts/28_postconfigure_config_registry.sh
+++ b/branches/ucs-3.0/ucs/base/univention-installer/scripts/28_postconfigure_config_registry.sh
@@ -295,7 +295,7 @@ univention-config-registry set version/patchlevel=$version_patchlevel
 univention-config-registry commit
 
 # Start syslogd
-/etc/init.d/sysklogd start
+invoke-rc.d sysklogd start
 
 
 __EOT__
diff --git a/branches/ucs-3.0/ucs/base/univention-installer/scripts/90_cleanup.sh b/branches/ucs-3.0/ucs/base/univention-installer/scripts/90_cleanup.sh
index 068fdf1..bb250c0 100755
--- a/branches/ucs-3.0/ucs/base/univention-installer/scripts/90_cleanup.sh
+++ b/branches/ucs-3.0/ucs/base/univention-installer/scripts/90_cleanup.sh
@@ -59,7 +59,7 @@ chroot /instmnt ./tmp/cleanup.sh
 
 cat >/instmnt/tmp/cleanup.sh <<__EOT__
 if [ -x /etc/init.d/nscd ]; then
-	/etc/init.d/nscd stop
+	invoke-rc.d nscd stop
 fi
 
 umount -a >/dev/null 2>&1
diff --git a/branches/ucs-3.0/ucs/base/univention-network-manager/debian/univention-network-manager.postinst b/branches/ucs-3.0/ucs/base/univention-network-manager/debian/univention-network-manager.postinst
index e5999bc..c67c3eb 100644
--- a/branches/ucs-3.0/ucs/base/univention-network-manager/debian/univention-network-manager.postinst
+++ b/branches/ucs-3.0/ucs/base/univention-network-manager/debian/univention-network-manager.postinst
@@ -50,7 +50,7 @@ univention-config-registry set dhclient/options/timeout?"40"
 univention-config-registry set dhclient/options/retry?"60"
 
 # need to reload dbus to read new permissions for networkmanager/group
-/etc/init.d/dbus reload
+invoke-rc.d dbus reload
 
 for i in $(seq 0 10); do
 	var="interfaces_eth${i}_ifplugd"
diff --git a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/00_rdate b/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/00_rdate
index 64684ed..6dc22e1 100755
--- a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/00_rdate
+++ b/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/00_rdate
@@ -33,6 +33,6 @@
 
 [ ! -f /var/run/ntpd.pid ] && exit 0
 
-/etc/init.d/ntp stop
+invoke-rc.d ntp stop
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/15_nscd b/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/15_nscd
index 9df8ed0..65d0bf0 100755
--- a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/15_nscd
+++ b/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/15_nscd
@@ -33,7 +33,7 @@
 [ ! -f /var/run/nscd/nscd.pid ] && exit 0
 
 if [ -x /etc/init.d/nscd ]; then
-	/etc/init.d/nscd restart
+	invoke-rc.d nscd restart
 	nscd -i passwd
 	nscd -i group
 fi
diff --git a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/50_gdm b/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/50_gdm
index e84e418..ddfb5ae 100755
--- a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/50_gdm
+++ b/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-down.d/50_gdm
@@ -32,7 +32,7 @@
 # <http://www.gnu.org/licenses/>.
 
 if [ -x /etc/init.d/gdm ]; then
-	/etc/init.d/gdm reload
+	invoke-rc.d gdm reload
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/05_rdate b/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/05_rdate
index ee8adbf..9707525 100755
--- a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/05_rdate
+++ b/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/05_rdate
@@ -36,8 +36,8 @@ ucs_ignore_interface
 
 [ ! -f /var/run/ntpd.pid ] && exit 0
 
-/etc/init.d/rdate start
+invoke-rc.d rdate start
 
-/etc/init.d/ntp start
+invoke-rc.d ntp start
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/15_nscd b/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/15_nscd
index ea20f04..c75ffe8 100755
--- a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/15_nscd
+++ b/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/15_nscd
@@ -36,7 +36,7 @@ ucs_ignore_interface
 [ ! -f /var/run/nscd/nscd.pid ] && exit 0
 
 if [ -x /etc/init.d/nscd ]; then
-	/etc/init.d/nscd restart
+	invoke-rc.d nscd restart
 	nscd -i passwd
 	nscd -i group
 fi
diff --git a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/50_gdm b/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/50_gdm
index aa847b2..da91a5a 100755
--- a/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/50_gdm
+++ b/branches/ucs-3.0/ucs/base/univention-network-manager/etc/network/if-up.d/50_gdm
@@ -61,7 +61,7 @@ fi
 
 if [ -x /etc/init.d/gdm ]; then
 	if [ "$reload" = "true" ]; then
-		/etc/init.d/gdm reload
+		invoke-rc.d gdm reload
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/base/univention-pam/debian/univention-pam.postinst b/branches/ucs-3.0/ucs/base/univention-pam/debian/univention-pam.postinst
index d480e01..40c87b3 100644
--- a/branches/ucs-3.0/ucs/base/univention-pam/debian/univention-pam.postinst
+++ b/branches/ucs-3.0/ucs/base/univention-pam/debian/univention-pam.postinst
@@ -122,7 +122,7 @@ if [ -e /etc/univention/templates/files/etc/pam.d/common-auth ]; then
 fi
 
 if [ -x "/etc/init.d/univention-directory-listener" ] ; then
-	/etc/init.d/univention-directory-listener crestart
+	invoke-rc.d univention-directory-listener crestart
 fi
 
 if [ "$1" = configure ]
diff --git a/branches/ucs-3.0/ucs/base/univention-pam/univention-nscd b/branches/ucs-3.0/ucs/base/univention-pam/univention-nscd
index c54687d..26d842b 100755
--- a/branches/ucs-3.0/ucs/base/univention-pam/univention-nscd
+++ b/branches/ucs-3.0/ucs/base/univention-pam/univention-nscd
@@ -32,6 +32,6 @@
 
 if [ "$1" = "postchange" ] ; then
 	if [ -x /etc/init.d/nscd ]; then
-		/etc/init.d/nscd restart
+		invoke-rc.d nscd restart
 	fi
 fi
diff --git a/branches/ucs-3.0/ucs/base/univention-passwd-cache/debian/libpam-passwdcache.postinst b/branches/ucs-3.0/ucs/base/univention-passwd-cache/debian/libpam-passwdcache.postinst
index 5422c38..99a94ad 100644
--- a/branches/ucs-3.0/ucs/base/univention-passwd-cache/debian/libpam-passwdcache.postinst
+++ b/branches/ucs-3.0/ucs/base/univention-passwd-cache/debian/libpam-passwdcache.postinst
@@ -38,7 +38,7 @@ if [ -e /etc/univention/passwdcache/shadow ]; then
 fi
 
 if [ -x /etc/init.d/univention-directory-listener ]; then
-	/etc/init.d/univention-directory-listener crestart
+	invoke-rc.d univention-directory-listener crestart
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/base/univention-quota/test/quotatest b/branches/ucs-3.0/ucs/base/univention-quota/test/quotatest
index 5883114..e21ccce 100755
--- a/branches/ucs-3.0/ucs/base/univention-quota/test/quotatest
+++ b/branches/ucs-3.0/ucs/base/univention-quota/test/quotatest
@@ -266,7 +266,7 @@ setup() {
 			warn "could not mount $fs with quota, skipping"
 		fi
 	done
-	/etc/init.d/quota restart &> /dev/null
+	invoke-rc.d quota restart &> /dev/null
 	debug "waiting for nfs (60 sec)..."
 	sleep 60
 }
@@ -275,7 +275,7 @@ resetup() {
 	debug "setting policy reference for share container..."
 	univention-directory-manager container/cn modify --dn="cn=quotatest,cn=shares,$ldap_base" \
 		--policy-reference="cn=quota_test,cn=userquota,cn=shares,cn=policies,$ldap_base" &>/dev/null
-	/etc/init.d/quota restart &> /dev/null
+	invoke-rc.d quota restart &> /dev/null
 	debug "waiting for nfs (60 sec)..."
 	sleep 60
 
diff --git a/branches/ucs-3.0/ucs/base/univention-runit/debian/univention-runit.postinst b/branches/ucs-3.0/ucs/base/univention-runit/debian/univention-runit.postinst
index a17f9c9..9037952 100644
--- a/branches/ucs-3.0/ucs/base/univention-runit/debian/univention-runit.postinst
+++ b/branches/ucs-3.0/ucs/base/univention-runit/debian/univention-runit.postinst
@@ -49,7 +49,7 @@ fi
 
 if [ -z "$2" ]; then
 	# only start the daemon during the installation
-	/etc/init.d/univention-runit start
+	invoke-rc.d univention-runit start
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/base/univention-ssl/debian/univention-ssl.postinst b/branches/ucs-3.0/ucs/base/univention-ssl/debian/univention-ssl.postinst
index 229d11a..2696c74 100755
--- a/branches/ucs-3.0/ucs/base/univention-ssl/debian/univention-ssl.postinst
+++ b/branches/ucs-3.0/ucs/base/univention-ssl/debian/univention-ssl.postinst
@@ -106,7 +106,7 @@ fi
 if [ "$1" = "configure" ]; then
 	if test -f /etc/init.d/univention-directory-listener
 		then
-		/etc/init.d/univention-directory-listener crestart || true
+		invoke-rc.d univention-directory-listener crestart || true
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/base/univention-system-setup/debian/univention-system-setup-appliance.init b/branches/ucs-3.0/ucs/base/univention-system-setup/debian/univention-system-setup-appliance.init
index 06a6006..125cdba 100644
--- a/branches/ucs-3.0/ucs/base/univention-system-setup/debian/univention-system-setup-appliance.init
+++ b/branches/ucs-3.0/ucs/base/univention-system-setup/debian/univention-system-setup-appliance.init
@@ -40,7 +40,7 @@ case "$1" in
 		if [ -n "$system_setup_appliance_start" ] && [ "$system_setup_appliance_start" = "yes" ] || [ "$system_setup_appliance_start" = "true" ]; then
 			run-parts /usr/lib/univention-system-setup/appliance-hooks.d/
 			univention-config-registry set system/setup/appliance/start=false
-			test -x /etc/init.d/gdm && /etc/init.d/gdm start
+			test -x /etc/init.d/gdm && invoke-rc.d gdm start
 		fi
 		log_action_end_msg 0
 		;;
diff --git a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/basis/10hostname b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/basis/10hostname
index 1d91a9a..80521ce 100644
--- a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/basis/10hostname
+++ b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/basis/10hostname
@@ -470,7 +470,7 @@ if [ -x "/usr/bin/newaliases" ]; then
 fi
 
 if [ -x "/etc/init.d/postfix" ]; then
-	/etc/init.d/postfix reload
+	invoke-rc.d postfix reload
 fi
 
 eval "$(univention-config-registry shell samba/user ldap/hostdn)"
diff --git a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/basis/12domainname b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/basis/12domainname
index cb2f711..de1123e 100644
--- a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/basis/12domainname
+++ b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/basis/12domainname
@@ -344,7 +344,7 @@ service_stop slapd
 service_start slapd nscd heimdal-kdc
 
 if [ -x "/etc/init.d/slapd" ]; then
-	/etc/init.d/slapd restart
+	invoke-rc.d slapd restart
 fi
 
 if [ "$ldap_available" = 1 ]; then
@@ -593,7 +593,7 @@ if [ -x "/usr/bin/newaliases" ]; then
 fi
 
 if [ -x "/etc/init.d/postfix" ]; then
-	/etc/init.d/postfix reload
+	invoke-rc.d postfix reload
 fi
 
 # stop the dns server and remove the cache
diff --git a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/language/11default_locale b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/language/11default_locale
index 27ecdfb..bdf270b 100644
--- a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/language/11default_locale
+++ b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/language/11default_locale
@@ -58,7 +58,7 @@ else
 	if [ -e "/var/www/$new_site" ]; then
 		univention-config-registry set apache2/startsite="$new_site"
 		if [ -x /etc/init.d/apache2 ]; then
-			/etc/init.d/apache2 reload
+			invoke-rc.d apache2 reload
 		fi
 	fi
 
diff --git a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/net/10interfaces b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/net/10interfaces
index 8e7d296..5f52670 100644
--- a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/net/10interfaces
+++ b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/net/10interfaces
@@ -488,7 +488,7 @@ if [ -n "$baseconfig_set" -o -n "$baseconfig_unset" ]; then
 	# shutdown ifplugd due to changed dhcp settings if neccessary
 	if [ "$restart_ifplugd" = 1 ] ; then
 		if [ -x "/etc/init.d/ifplugd" ] ; then
-			/etc/init.d/ifplugd stop
+			invoke-rc.d ifplugd stop
 		fi
 	fi
 
@@ -521,7 +521,7 @@ if [ -n "$baseconfig_set" -o -n "$baseconfig_unset" ]; then
 	# restart ifplugd due to changed dhcp settings if neccessary
 	if [ "$restart_ifplugd" = 1 ] ; then
 		if [ -x "/etc/init.d/ifplugd" ] ; then
-			/etc/init.d/ifplugd start
+			invoke-rc.d ifplugd start
 		fi
 	fi
 
@@ -553,7 +553,7 @@ if [ -n "$baseconfig_set" -o -n "$baseconfig_unset" ]; then
 		for i in `pidof nmbd`; do
 			/bin/kill -9 $i
 		done
-		/etc/init.d/samba restart
+		invoke-rc.d samba restart
 	fi
 
 fi
diff --git a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/security/10security b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/security/10security
index 4a047bb..fe1904f 100644
--- a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/security/10security
+++ b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/security/10security
@@ -150,7 +150,7 @@ fi
 
 echo `date` : "Restarting univention-iptables "  >> /var/log/univention/setup.log
 
-/etc/init.d/univention-iptables restart >> /var/log/univention/setup.log
+invoke-rc.d univention-iptables restart >> /var/log/univention/setup.log
 
 exit 0
 
diff --git a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/setup_utils.sh b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/setup_utils.sh
index b0591af..c9bc74d 100644
--- a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/setup_utils.sh
+++ b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/setup_utils.sh
@@ -83,7 +83,7 @@ service_stop ()
 {
 	for service in $@; do
 		if [ -x /etc/init.d/$service ]; then
-			/etc/init.d/$service stop
+			invoke-rc.d $service stop
 		fi
 	done
 }
@@ -91,7 +91,7 @@ service_start ()
 {
 	for service in $@; do
 		if [ -x /etc/init.d/$service ]; then
-			/etc/init.d/$service start
+			invoke-rc.d $service start
 		fi
 	done
 }
diff --git a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/timezone/10timezone b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/timezone/10timezone
index 3cd509a..97bb085 100644
--- a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/timezone/10timezone
+++ b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/lib/univention-system-setup/scripts/timezone/10timezone
@@ -53,8 +53,8 @@ fi
 echo "$timezone" >/etc/timezone
 ln -sf /usr/share/zoneinfo/$timezone /etc/localtime
 
-test -x /etc/init.d/ntp-server && /etc/init.d/ntp-server stop
-test -x /etc/init.d/ntpdate && /etc/init.d/ntpdate restart
-test -x /etc/init.d/ntp-server && /etc/init.d/ntp-server start
+test -x /etc/init.d/ntp-server && invoke-rc.d ntp-server stop
+test -x /etc/init.d/ntpdate && invoke-rc.d ntpdate restart
+test -x /etc/init.d/ntp-server && invoke-rc.d ntp-server start
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/share/univention-system-setup/startxwithfirefox b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/share/univention-system-setup/startxwithfirefox
index e501028..5fd818c 100755
--- a/branches/ucs-3.0/ucs/base/univention-system-setup/usr/share/univention-system-setup/startxwithfirefox
+++ b/branches/ucs-3.0/ucs/base/univention-system-setup/usr/share/univention-system-setup/startxwithfirefox
@@ -46,7 +46,7 @@ then # call self in xinit as nobody, then start gdm
 		/usr/share/univention-system-setup/univention-system-setup --modules="password,net" < /dev/tty1 > /dev/tty1
 	fi
 	if [ -x /etc/init.d/gdm ] ; then
-		/etc/init.d/gdm start
+		invoke-rc.d gdm start
 	fi
 	exit
 fi
diff --git a/branches/ucs-3.0/ucs/base/univention-updater/script/set-apache-permissions b/branches/ucs-3.0/ucs/base/univention-updater/script/set-apache-permissions
index 87b230b..d6c3a32 100755
--- a/branches/ucs-3.0/ucs/base/univention-updater/script/set-apache-permissions
+++ b/branches/ucs-3.0/ucs/base/univention-updater/script/set-apache-permissions
@@ -33,13 +33,13 @@
 if [ -e /usr/sbin/apache2 ] && [ ! -x /usr/sbin/apache2 ]; then
 	/usr/sbin/dpkg-statoverride --remove /usr/sbin/apache2 >/dev/null 2>&1
 	chmod +x /usr/sbin/apache2
-	/etc/init.d/apache2 restart >/dev/null 2>&1
+	invoke-rc.d apache2 restart >/dev/null 2>&1
 fi
 
 if [ -e /usr/sbin/univention-management-console-server ] && [ ! -x /usr/sbin/univention-management-console-server ]; then
 	/usr/sbin/dpkg-statoverride --remove /usr/sbin/univention-management-console-server >/dev/null 2>&1
 	chmod +x /usr/sbin/univention-management-console-server
-	/etc/init.d/univention-management-console-server restart >/dev/null 2>&1
+	invoke-rc.d univention-management-console-server restart >/dev/null 2>&1
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/desktop/univention-network-manager/debian/univention-network-manager.postinst b/branches/ucs-3.0/ucs/desktop/univention-network-manager/debian/univention-network-manager.postinst
index e730c4b..7bed6bf 100644
--- a/branches/ucs-3.0/ucs/desktop/univention-network-manager/debian/univention-network-manager.postinst
+++ b/branches/ucs-3.0/ucs/desktop/univention-network-manager/debian/univention-network-manager.postinst
@@ -50,7 +50,7 @@ univention-config-registry set dhclient/options/timeout?"40"
 univention-config-registry set dhclient/options/retry?"60"
 
 # need to reload dbus to read new permissions for networkmanager/group
-/etc/init.d/dbus reload
+invoke-rc.d dbus reload
 
 for i in $(seq 0 4); do
 	var="interfaces_eth${i}_ifplugd"
diff --git a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/00_rdate b/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/00_rdate
index 64684ed..6dc22e1 100755
--- a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/00_rdate
+++ b/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/00_rdate
@@ -33,6 +33,6 @@
 
 [ ! -f /var/run/ntpd.pid ] && exit 0
 
-/etc/init.d/ntp stop
+invoke-rc.d ntp stop
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/15_nscd b/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/15_nscd
index 9df8ed0..65d0bf0 100755
--- a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/15_nscd
+++ b/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/15_nscd
@@ -33,7 +33,7 @@
 [ ! -f /var/run/nscd/nscd.pid ] && exit 0
 
 if [ -x /etc/init.d/nscd ]; then
-	/etc/init.d/nscd restart
+	invoke-rc.d nscd restart
 	nscd -i passwd
 	nscd -i group
 fi
diff --git a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/50_gdm b/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/50_gdm
index e84e418..ddfb5ae 100755
--- a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/50_gdm
+++ b/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-down.d/50_gdm
@@ -32,7 +32,7 @@
 # <http://www.gnu.org/licenses/>.
 
 if [ -x /etc/init.d/gdm ]; then
-	/etc/init.d/gdm reload
+	invoke-rc.d gdm reload
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/05_rdate b/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/05_rdate
index ee8adbf..9707525 100755
--- a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/05_rdate
+++ b/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/05_rdate
@@ -36,8 +36,8 @@ ucs_ignore_interface
 
 [ ! -f /var/run/ntpd.pid ] && exit 0
 
-/etc/init.d/rdate start
+invoke-rc.d rdate start
 
-/etc/init.d/ntp start
+invoke-rc.d ntp start
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/15_nscd b/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/15_nscd
index ea20f04..c75ffe8 100755
--- a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/15_nscd
+++ b/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/15_nscd
@@ -36,7 +36,7 @@ ucs_ignore_interface
 [ ! -f /var/run/nscd/nscd.pid ] && exit 0
 
 if [ -x /etc/init.d/nscd ]; then
-	/etc/init.d/nscd restart
+	invoke-rc.d nscd restart
 	nscd -i passwd
 	nscd -i group
 fi
diff --git a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/50_gdm b/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/50_gdm
index aa847b2..da91a5a 100755
--- a/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/50_gdm
+++ b/branches/ucs-3.0/ucs/desktop/univention-network-manager/etc/network/if-up.d/50_gdm
@@ -61,7 +61,7 @@ fi
 
 if [ -x /etc/init.d/gdm ]; then
 	if [ "$reload" = "true" ]; then
-		/etc/init.d/gdm reload
+		invoke-rc.d gdm reload
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/mail/univention-antivir-mail/debian/univention-antivir-mail.postinst b/branches/ucs-3.0/ucs/mail/univention-antivir-mail/debian/univention-antivir-mail.postinst
index 425c16b..28b3629 100644
--- a/branches/ucs-3.0/ucs/mail/univention-antivir-mail/debian/univention-antivir-mail.postinst
+++ b/branches/ucs-3.0/ucs/mail/univention-antivir-mail/debian/univention-antivir-mail.postinst
@@ -59,9 +59,8 @@ univention-config-registry set mail/antivir/amavis/autostart?"yes" \
 
 #DEBHELPER#
 
-test -x /etc/init.d/clamav-daemon && /etc/init.d/clamav-daemon restart || true
-test -x /etc/init.d/spamassassin && /etc/init.d/spamassassin restart || true
-
-/etc/init.d/amavis restart
+test -x /etc/init.d/clamav-daemon && invoke-rc.d clamav-daemon restart || true
+test -x /etc/init.d/spamassassin && invoke-rc.d spamassassin restart || true
+test -x /etc/init.d/amavis && invoke-rc.d amavis restart || true
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/mail/univention-fetchmail/debian/univention-fetchmail-schema.postinst b/branches/ucs-3.0/ucs/mail/univention-fetchmail/debian/univention-fetchmail-schema.postinst
index 6262a43..28bef16 100644
--- a/branches/ucs-3.0/ucs/mail/univention-fetchmail/debian/univention-fetchmail-schema.postinst
+++ b/branches/ucs-3.0/ucs/mail/univention-fetchmail/debian/univention-fetchmail-schema.postinst
@@ -36,7 +36,7 @@ eval "$(univention-config-registry shell)"
 
 univention-config-registry commit /etc/ldap/slapd.conf
 
-/etc/init.d/slapd crestart
+invoke-rc.d slapd crestart
 
 . /usr/share/univention-lib/all.sh
 
diff --git a/branches/ucs-3.0/ucs/mail/univention-fetchmail/debian/univention-fetchmail.postinst b/branches/ucs-3.0/ucs/mail/univention-fetchmail/debian/univention-fetchmail.postinst
index 117b3a4..1589244 100644
--- a/branches/ucs-3.0/ucs/mail/univention-fetchmail/debian/univention-fetchmail.postinst
+++ b/branches/ucs-3.0/ucs/mail/univention-fetchmail/debian/univention-fetchmail.postinst
@@ -37,6 +37,6 @@ univention-config-registry set fetchmail/enabled?yes
 . /usr/share/univention-lib/all.sh
 call_joinscript 92univention-fetchmail.inst
 
-/etc/init.d/univention-directory-listener crestart
+invoke-rc.d univention-directory-listener crestart
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/mail/univention-horde4/debian/univention-horde4.postinst b/branches/ucs-3.0/ucs/mail/univention-horde4/debian/univention-horde4.postinst
index 75c4ce0..179745b 100644
--- a/branches/ucs-3.0/ucs/mail/univention-horde4/debian/univention-horde4.postinst
+++ b/branches/ucs-3.0/ucs/mail/univention-horde4/debian/univention-horde4.postinst
@@ -100,7 +100,7 @@ call_joinscript 85univention-horde4.inst
 dpkg-statoverride --add --update --quiet root www-data 4750 /usr/share/univention-horde4/univention-horde-login-wrapper
 
 if [ -x /etc/init.d/apache2 ]; then
-	/etc/init.d/apache2 reload
+	invoke-rc.d apache2 reload
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/mail/univention-mail-cyrus-murder/debian/univention-mail-cyrus-murder.postinst b/branches/ucs-3.0/ucs/mail/univention-mail-cyrus-murder/debian/univention-mail-cyrus-murder.postinst
index cce3eea..cd19ae7 100644
--- a/branches/ucs-3.0/ucs/mail/univention-mail-cyrus-murder/debian/univention-mail-cyrus-murder.postinst
+++ b/branches/ucs-3.0/ucs/mail/univention-mail-cyrus-murder/debian/univention-mail-cyrus-murder.postinst
@@ -50,7 +50,7 @@ fi
 univention-config-registry set mail/cyrus/murder/crontime='0 2 * * *'
 
 # activate the listener modules
-/etc/init.d/univention-directory-listener restart
+invoke-rc.d univention-directory-listener restart
 
 # configure firewall
 ucr set \
diff --git a/branches/ucs-3.0/ucs/mail/univention-mail-cyrus-murder/usr/lib/univention-server/server_password_change.d/univention-mail-cyrus-murder b/branches/ucs-3.0/ucs/mail/univention-mail-cyrus-murder/usr/lib/univention-server/server_password_change.d/univention-mail-cyrus-murder
index 0fc6803..0676d65 100755
--- a/branches/ucs-3.0/ucs/mail/univention-mail-cyrus-murder/usr/lib/univention-server/server_password_change.d/univention-mail-cyrus-murder
+++ b/branches/ucs-3.0/ucs/mail/univention-mail-cyrus-murder/usr/lib/univention-server/server_password_change.d/univention-mail-cyrus-murder
@@ -37,10 +37,10 @@ if [ "$1" = "postchange" -o "$1" = "nochange" ] ; then
 	univention-config-registry commit /etc/imapd/imapd.conf /etc/imapd/frontend.conf
 	
 	if [ -x "/etc/init.d/cyrus-imapd" ]; then
-		/etc/init.d/cyrus-imapd reload
+		invoke-rc.d cyrus-imapd reload
 	fi
 
 	if [ -x "/etc/init.d/cyrus2.2" ]; then
-		/etc/init.d/cyrus2.2 reload
+		invoke-rc.d cyrus2.2 reload
 	fi
 fi
diff --git a/branches/ucs-3.0/ucs/mail/univention-mail-cyrus/debian/univention-mail-cyrus.postinst b/branches/ucs-3.0/ucs/mail/univention-mail-cyrus/debian/univention-mail-cyrus.postinst
index ad65560..73ab250 100644
--- a/branches/ucs-3.0/ucs/mail/univention-mail-cyrus/debian/univention-mail-cyrus.postinst
+++ b/branches/ucs-3.0/ucs/mail/univention-mail-cyrus/debian/univention-mail-cyrus.postinst
@@ -112,9 +112,9 @@ fi
 
 # restart saslauthd
 if [ -x /etc/init.d/saslauthd ]; then
-	/etc/init.d/saslauthd stop || true
+	invoke-rc.d saslauthd stop || true
 	sleep 1
-	/etc/init.d/saslauthd start || true
+	invoke-rc.d saslauthd start || true
 fi
 
 # run join script
@@ -124,15 +124,15 @@ fi
 
 # restart cyrus
 if [ -x /etc/init.d/cyrus2.2 ]; then
-	/etc/init.d/cyrus2.2 restart
+	invoke-rc.d cyrus2.2 restart
 fi
 if [ -x /etc/init.d/cyrus-imapd ]; then
-	/etc/init.d/cyrus-imapd restart
+	invoke-rc.d cyrus-imapd restart
 fi
 
 # restart listener
 if [ -x /etc/init.d/univention-directory-listener ]; then
-	/etc/init.d/univention-directory-listener crestart
+	invoke-rc.d univention-directory-listener crestart
 fi
 
 # configure firewall
diff --git a/branches/ucs-3.0/ucs/mail/univention-mail-postfix/debian/univention-mail-postfix.postinst b/branches/ucs-3.0/ucs/mail/univention-mail-postfix/debian/univention-mail-postfix.postinst
index cced863..ab40ee8 100644
--- a/branches/ucs-3.0/ucs/mail/univention-mail-postfix/debian/univention-mail-postfix.postinst
+++ b/branches/ucs-3.0/ucs/mail/univention-mail-postfix/debian/univention-mail-postfix.postinst
@@ -96,7 +96,7 @@ adduser postfix sasl
 univention-config-registry commit /etc/mailname
 
 if [ -z "$postfix_autostart" ] || [ "$postfix_autostart" = "yes" ]; then
-	/etc/init.d/postfix restart
+	invoke-rc.d postfix restart
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/mail/univention-mail-postfix/debian/univention-mail-server.postinst b/branches/ucs-3.0/ucs/mail/univention-mail-postfix/debian/univention-mail-server.postinst
index ef1ec1b..cf2f757 100644
--- a/branches/ucs-3.0/ucs/mail/univention-mail-postfix/debian/univention-mail-server.postinst
+++ b/branches/ucs-3.0/ucs/mail/univention-mail-postfix/debian/univention-mail-server.postinst
@@ -46,13 +46,13 @@ for file in transport virtual canonical access relocated; do
 done
 
 # restart to activate new listener module
-/etc/init.d/univention-directory-listener crestart
+invoke-rc.d univention-directory-listener crestart
 
 . /usr/share/univention-lib/all.sh
 call_joinscript 67univention-mail-server.inst
 
 if [ -z "$postfix_autostart" ] || [ "$postfix_autostart" = "yes" ]; then
-	/etc/init.d/postfix restart
+	invoke-rc.d postfix restart
 fi
 
 # configure firewall
diff --git a/branches/ucs-3.0/ucs/mail/univention-mail-postfix/usr/lib/univention-server/server_password_change.d/50univention-mail-server b/branches/ucs-3.0/ucs/mail/univention-mail-postfix/usr/lib/univention-server/server_password_change.d/50univention-mail-server
index 211b821..9cc5a1d 100755
--- a/branches/ucs-3.0/ucs/mail/univention-mail-postfix/usr/lib/univention-server/server_password_change.d/50univention-mail-server
+++ b/branches/ucs-3.0/ucs/mail/univention-mail-postfix/usr/lib/univention-server/server_password_change.d/50univention-mail-server
@@ -35,7 +35,7 @@ if [ "$1" = "prechange" ] ; then
 	if /etc/init.d/postfix status | grep -q "is running" ; then
 		univention-config-registry set mail/postfix/stoppedbyserverpasswordchange=yes
 		echo "stopping postfix due to upcoming server password change" | logger -t "server-password-change"
-		/etc/init.d/postfix stop
+		invoke-rc.d postfix stop
 	fi
 fi
 
@@ -45,7 +45,7 @@ if [ "$1" = "postchange" -o "$1" = "nochange" ] ; then
 	# start postfix only if it has been stopped by this script
 	if [ "$mail_postfix_stoppedbyserverpasswordchange" = "yes" ] ; then
 		echo "starting postfix after server password change" | logger -t "server-password-change"
-		/etc/init.d/postfix start
+		invoke-rc.d postfix start
 		univention-config-registry unset mail/postfix/stoppedbyserverpasswordchange
 	fi
 fi
diff --git a/branches/ucs-3.0/ucs/mail/univention-spamassassin/debian/univention-spamassassin.postinst b/branches/ucs-3.0/ucs/mail/univention-spamassassin/debian/univention-spamassassin.postinst
index 81f8181..ce18b60 100644
--- a/branches/ucs-3.0/ucs/mail/univention-spamassassin/debian/univention-spamassassin.postinst
+++ b/branches/ucs-3.0/ucs/mail/univention-spamassassin/debian/univention-spamassassin.postinst
@@ -44,7 +44,7 @@ univention-config-registry set mail/antivir/spam?yes \
 	mail/antispam/autostart?yes
 
 if [ -x /etc/init.d/postfix ]; then
-	/etc/init.d/postfix reload || true
+	invoke-rc.d postfix reload || true
 fi
 
 #DEBHELPER#
diff --git a/branches/ucs-3.0/ucs/mail/univention-spamassassin/debian/univention-spamassassin.postrm b/branches/ucs-3.0/ucs/mail/univention-spamassassin/debian/univention-spamassassin.postrm
index 850b762..21408ae 100644
--- a/branches/ucs-3.0/ucs/mail/univention-spamassassin/debian/univention-spamassassin.postrm
+++ b/branches/ucs-3.0/ucs/mail/univention-spamassassin/debian/univention-spamassassin.postrm
@@ -36,7 +36,7 @@
 ucr set mail/antivir/spam=no
 
 if [ -x /etc/init.d/postfix ]; then
-	/etc/init.d/postfix restart
+	invoke-rc.d postfix restart
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/management/univention-admingrp-user-passwordreset/debian/univention-admingrp-user-passwordreset.postinst b/branches/ucs-3.0/ucs/management/univention-admingrp-user-passwordreset/debian/univention-admingrp-user-passwordreset.postinst
index ae00faf..f5d4606 100644
--- a/branches/ucs-3.0/ucs/management/univention-admingrp-user-passwordreset/debian/univention-admingrp-user-passwordreset.postinst
+++ b/branches/ucs-3.0/ucs/management/univention-admingrp-user-passwordreset/debian/univention-admingrp-user-passwordreset.postinst
@@ -46,7 +46,7 @@ case "$1" in
 				ldap/acl/user/passwordreset/attributes?"krb5Key,userPassword,sambaPwdCanChange,sambaPwdMustChange,sambaLMPassword,sambaNTPassword,sambaPwdLastSet,pwhistory,sambaPasswordHistory,krb5KDCFlags,krb5KeyVersionNumber,krb5PasswordEnd,shadowMax,shadowLastChange"
 
 		# restart LDAP server
-		/etc/init.d/slapd crestart
+		invoke-rc.d slapd crestart
 		;;
 
 	*)
diff --git a/branches/ucs-3.0/ucs/management/univention-directory-listener/03univention-directory-listener.inst b/branches/ucs-3.0/ucs/management/univention-directory-listener/03univention-directory-listener.inst
index 1f2c9bb..959e338 100755
--- a/branches/ucs-3.0/ucs/management/univention-directory-listener/03univention-directory-listener.inst
+++ b/branches/ucs-3.0/ucs/management/univention-directory-listener/03univention-directory-listener.inst
@@ -104,7 +104,7 @@ sleep 15
 
 if [ -f /etc/init.d/slapd ]
     then
-    /etc/init.d/slapd restart
+    invoke-rc.d slapd restart
 fi
 
 if [ $exit_status != 0 ]; then
@@ -119,7 +119,7 @@ if test -e "/var/lib/univention-directory-listener/handlers/replication"; then
 fi
 
 # The samba join script needs a running listener. Bug #19128
-/etc/init.d/univention-directory-listener start
+invoke-rc.d univention-directory-listener start
 
 test -x /usr/sbin/nscd && /usr/sbin/nscd -i passwd
 test -x /usr/sbin/nscd && /usr/sbin/nscd -i group
diff --git a/branches/ucs-3.0/ucs/management/univention-directory-listener/debian/univention-directory-listener.postinst b/branches/ucs-3.0/ucs/management/univention-directory-listener/debian/univention-directory-listener.postinst
index 8918ae5..74a4c25 100644
--- a/branches/ucs-3.0/ucs/management/univention-directory-listener/debian/univention-directory-listener.postinst
+++ b/branches/ucs-3.0/ucs/management/univention-directory-listener/debian/univention-directory-listener.postinst
@@ -92,7 +92,7 @@ if [ "$1" = "configure" -a -n "$2" ]; then
 		mv /var/lib/univention-directory-listener/__* /var/univention-backup/listener-cache-ucs_3.0-ms1/
 		mv /var/lib/univention-directory-listener/log.* /var/univention-backup/listener-cache-ucs_3.0-ms1/
 	fi
-	/etc/init.d/univention-directory-listener crestart
+	invoke-rc.d univention-directory-listener crestart
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/management/univention-directory-logger/debian/postinst b/branches/ucs-3.0/ucs/management/univention-directory-logger/debian/postinst
index 5a815e3..8323ad5 100644
--- a/branches/ucs-3.0/ucs/management/univention-directory-logger/debian/postinst
+++ b/branches/ucs-3.0/ucs/management/univention-directory-logger/debian/postinst
@@ -57,14 +57,14 @@ if [ "$1" = "configure" ]; then
 	univention-config-registry commit /etc/ldap/slapd.conf
 
 	## restart the OpenLDAP Server to load the module
-	/etc/init.d/slapd restart
+	invoke-rc.d slapd restart
 
 	# exclude temporary objects by default
 	eval "$(univention-config-registry shell ldap/base)"
 	univention-config-registry set "${registrySection}/exclude1"?"cn=temporary,cn=univention,$ldap_base"
 
 	## load the listener module
-	/etc/init.d/univention-directory-listener crestart
+	invoke-rc.d univention-directory-listener crestart
 
 fi
 
diff --git a/branches/ucs-3.0/ucs/management/univention-directory-logger/debian/postrm b/branches/ucs-3.0/ucs/management/univention-directory-logger/debian/postrm
index 57708f2..51c80b3 100644
--- a/branches/ucs-3.0/ucs/management/univention-directory-logger/debian/postrm
+++ b/branches/ucs-3.0/ucs/management/univention-directory-logger/debian/postrm
@@ -39,7 +39,7 @@ dellog=${workdir}/dellog
 case "$1" in
 	"remove")
 		## unload the listener module
-		/etc/init.d/univention-directory-listener crestart
+		invoke-rc.d univention-directory-listener crestart
 
 		## unset directory variable, to stop dellog template activation
 		univention-config-registry unset "${registrySection}/dellogdir"
@@ -48,7 +48,7 @@ case "$1" in
 		univention-config-registry commit /etc/ldap/slapd.conf
 
 		## restart the OpenLDAP Server to unload the overlay
-		/etc/init.d/slapd restart
+		invoke-rc.d slapd restart
 
 		## unset main ucr variable
 		univention-config-registry unset "${registrySection}"
diff --git a/branches/ucs-3.0/ucs/management/univention-directory-manager-modules/test/univention-admin-test b/branches/ucs-3.0/ucs/management/univention-directory-manager-modules/test/univention-admin-test
index 506161e..bf582ef 100755
--- a/branches/ucs-3.0/ucs/management/univention-directory-manager-modules/test/univention-admin-test
+++ b/branches/ucs-3.0/ucs/management/univention-directory-manager-modules/test/univention-admin-test
@@ -635,7 +635,7 @@ EOF
 	fi
 	cp /etc/ldap/slapd.conf /etc/ldap/slapd.conf.testbackup
 	echo '/^schemacheck		on
Oinclude			/etc/ldap/schema/testolb.schema
include			/etc/ldap/schema/testolbperson.schema
:wq' | vim /etc/ldap/slapd.conf >/dev/null 2>/dev/null
-	/etc/init.d/slapd restart
+	invoke-rc.d slapd restart
 
 	adminwrap $LINENO settings/customattribute create --set module=users/user --set objectClass=testfiliale --set syntax=string --set ldapMapping=testfilialbereich --set shortDescription=\"testFilial bereich\" --set longDescription=testFilialbereich --set name=testfiliale --set multivalue=1 --position \"cn=custom attributes,cn=univention,$ldap_base\"
 
@@ -5159,7 +5159,7 @@ then
 	adminwrap $LINENO settings/customattribute remove --dn \"cn=testfiliale,cn=custom attributes,cn=univention,$ldap_base\"
 	adminwrap $LINENO settings/customattribute remove --dn \"cn=testpctyp,cn=custom attributes,cn=univention,$ldap_base\"
 	mv /etc/ldap/slapd.conf.testbackup /etc/ldap/slapd.conf
-	/etc/init.d/slapd restart
+	invoke-rc.d slapd restart
 fi
 
 createcomputers_managedclient()
diff --git a/branches/ucs-3.0/ucs/management/univention-directory-notifier/02univention-directory-notifier.inst b/branches/ucs-3.0/ucs/management/univention-directory-notifier/02univention-directory-notifier.inst
index eb13d01..978b6c7 100755
--- a/branches/ucs-3.0/ucs/management/univention-directory-notifier/02univention-directory-notifier.inst
+++ b/branches/ucs-3.0/ucs/management/univention-directory-notifier/02univention-directory-notifier.inst
@@ -43,7 +43,7 @@ test -n "`grep "univention-directory-notifier v${VERSION} successful" /usr/lib/u
 
 ln -sf /etc/runit/univention-directory-notifier /etc/runit/univention/univention-directory-notifier
 
-/etc/init.d/univention-directory-notifier start
+invoke-rc.d univention-directory-notifier start
 
 test -n "`grep "univention-directory-notifier v${VERSION} successful" /usr/lib/univention-install/.index.txt`" || echo "univention-directory-notifier v${VERSION} successful" >>/usr/lib/univention-install/.index.txt
 
diff --git a/branches/ucs-3.0/ucs/management/univention-directory-notifier/15univention-directory-notifier-post.inst b/branches/ucs-3.0/ucs/management/univention-directory-notifier/15univention-directory-notifier-post.inst
index a63ea0f..969a01d 100755
--- a/branches/ucs-3.0/ucs/management/univention-directory-notifier/15univention-directory-notifier-post.inst
+++ b/branches/ucs-3.0/ucs/management/univention-directory-notifier/15univention-directory-notifier-post.inst
@@ -55,11 +55,11 @@ if [ ! -e /var/lib/univention-ldap/$i.lock ]; then
 fi
 
 if [ -x /etc/init.d/univention-directory-notifier ]; then
-	/etc/init.d/univention-directory-notifier restart
+	invoke-rc.d univention-directory-notifier restart
 fi
 
 if [ -x /etc/init.d/univention-directory-listener ]; then
-	/etc/init.d/univention-directory-listener restart
+	invoke-rc.d univention-directory-listener restart
 fi
 
 test -n "`grep "univention-directory-notifier-post v${VERSION} successful" /usr/lib/univention-install/.index.txt`" || echo "univention-directory-notifier-post v${VERSION} successful" >>/usr/lib/univention-install/.index.txt
diff --git a/branches/ucs-3.0/ucs/management/univention-directory-notifier/debian/univention-directory-notifier.postinst b/branches/ucs-3.0/ucs/management/univention-directory-notifier/debian/univention-directory-notifier.postinst
index 1c419ab..0fdbd8c 100644
--- a/branches/ucs-3.0/ucs/management/univention-directory-notifier/debian/univention-directory-notifier.postinst
+++ b/branches/ucs-3.0/ucs/management/univention-directory-notifier/debian/univention-directory-notifier.postinst
@@ -110,12 +110,12 @@ fi
 
 if [ "$1" = "configure" -a -n "$2" ]; then
 	if dpkg --compare-versions "$2" lt 1.10; then
-		/etc/init.d/univention-directory-notifier restart || true
+		invoke-rc.d univention-directory-notifier restart || true
 	else
-		/etc/init.d/univention-directory-notifier crestart || true
+		invoke-rc.d univention-directory-notifier crestart || true
 	fi
 elif [ "$1" = "configure" ]; then
-	/etc/init.d/univention-directory-notifier restart || true
+	invoke-rc.d univention-directory-notifier restart || true
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/management/univention-directory-replication/debian/postinst b/branches/ucs-3.0/ucs/management/univention-directory-replication/debian/postinst
index 8ffcba1..ef85ae0 100644
--- a/branches/ucs-3.0/ucs/management/univention-directory-replication/debian/postinst
+++ b/branches/ucs-3.0/ucs/management/univention-directory-replication/debian/postinst
@@ -45,6 +45,6 @@ univention-config-registry set	ldap/replication/filesystem/check?false \
 
 #DEBHELPER#
 
-/etc/init.d/univention-directory-listener crestart
+invoke-rc.d univention-directory-listener crestart
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/management/univention-directory-replication/replication.py b/branches/ucs-3.0/ucs/management/univention-directory-replication/replication.py
index 9c0f3ae..acd257c 100644
--- a/branches/ucs-3.0/ucs/management/univention-directory-replication/replication.py
+++ b/branches/ucs-3.0/ucs/management/univention-directory-replication/replication.py
@@ -842,7 +842,7 @@ def handler(dn, new, listener_old):
 				s.close()
 
 				listener.setuid(0)
-				os.system('/etc/init.d/univention-directory-listener stop')
+				os.system('invoke-rc.d univention-directory-listener stop')
 				listener.unsetuid()
 
 		# Read old entry directly from LDAP server
diff --git a/branches/ucs-3.0/ucs/management/univention-directory-replication/univention-directory-replication-resync b/branches/ucs-3.0/ucs/management/univention-directory-replication/univention-directory-replication-resync
index 04a1e6a..eae59f2 100755
--- a/branches/ucs-3.0/ucs/management/univention-directory-replication/univention-directory-replication-resync
+++ b/branches/ucs-3.0/ucs/management/univention-directory-replication/univention-directory-replication-resync
@@ -111,7 +111,7 @@ then
 		mkdir -p /var/lib/univention-directory-replication; chmod -R 700 /var/lib/univention-directory-replication
 	fi
 	mv $1 "/var/lib/univention-directory-replication/replayed.ldif_$d"; chmod 600 "/var/lib/univention-directory-replication/replayed.ldif_$d"
-	/etc/init.d/univention-directory-listener start
+	invoke-rc.d univention-directory-listener start
 	exit 0
 else
 	echo "some DNs have failed and have to be synced manually:"
diff --git a/branches/ucs-3.0/ucs/management/univention-join/univention-join b/branches/ucs-3.0/ucs/management/univention-join/univention-join
index 51637a3..1127276 100755
--- a/branches/ucs-3.0/ucs/management/univention-join/univention-join
+++ b/branches/ucs-3.0/ucs/management/univention-join/univention-join
@@ -226,7 +226,7 @@ if [ -z "$DCNAME" ]; then
 				echo -e "\033[60Gdone"
 				echo "domain $domainname" >/etc/resolv.conf
 				echo "nameserver $i" >>/etc/resolv.conf
-				test -x /etc/init.d/nscd && /etc/init.d/nscd restart >>/var/log/univention/join.log 2>&1
+				test -x /etc/init.d/nscd && invoke-rc.d nscd restart >>/var/log/univention/join.log 2>&1
 				break
 			fi
 		done
@@ -255,13 +255,13 @@ echo -e "\033[60Gdone"
 
 if [ -x /etc/init.d/slapd ]; then
 	echo -n "Stop LDAP Server: "
-	/etc/init.d/slapd stop >>/var/log/univention/join.log 2>&1
+	invoke-rc.d slapd stop >>/var/log/univention/join.log 2>&1
 	echo -e "\033[60Gdone"
 fi
 
 if [ -x /etc/init.d/samba4 ]; then
 	echo -n "Stop Samba 4 Server: "
-	/etc/init.d/samba4 stop >>/var/log/univention/join.log 2>&1
+	invoke-rc.d samba4 stop >>/var/log/univention/join.log 2>&1
 	echo -e "\033[60Gdone"
 fi
 
@@ -282,7 +282,7 @@ fi
 
 if [ -x /etc/init.d/slapd ]; then
 	echo -n "Start LDAP Server: "
-	/etc/init.d/slapd start >>/var/log/univention/join.log 2>&1
+	invoke-rc.d slapd start >>/var/log/univention/join.log 2>&1
 	echo -e "\033[60Gdone"
 fi
 
@@ -420,16 +420,16 @@ fi
 notifier_pid=`pidof univention-directory-notifier`
 if [ -n "$notifier_pid" -a -e /etc/runit/univention/univention-directory-notifier ]; then
 	echo -n "Stopping univention-directory-notifier daemon: "
-	/etc/init.d/univention-directory-notifier stop >/dev/null 2>&1
-	while ! sv status univention-directory-notifier | grep "^down" >/dev/null ; do sleep 1; /etc/init.d/univention-directory-notifier stop >/dev/null 2>&1; echo -n "." ;done; echo "" done
+	invoke-rc.d univention-directory-notifier stop >/dev/null 2>&1
+	while ! sv status univention-directory-notifier | grep "^down" >/dev/null ; do sleep 1; invoke-rc.d univention-directory-notifier stop >/dev/null 2>&1; echo -n "." ;done; echo "" done
 fi
 
 # Stop Listener
 listener_pid=`pidof univention-directory-listener`
 if [ -e /etc/runit/univention/univention-directory-listener ]; then
 	echo -n "Stopping univention-directory-listener daemon: "
-	/etc/init.d/univention-directory-listener stop >/dev/null 2>&1
-	while ! sv status univention-directory-listener | grep "^down" >/dev/null ; do sleep 1; /etc/init.d/univention-directory-listener stop >/dev/null 2>&1; echo -n "." ;done; echo "" done
+	invoke-rc.d univention-directory-listener stop >/dev/null 2>&1
+	while ! sv status univention-directory-listener | grep "^down" >/dev/null ; do sleep 1; invoke-rc.d univention-directory-listener stop >/dev/null 2>&1; echo -n "." ;done; echo "" done
 fi
 rm -Rf /var/lib/univention-directory-listener/*
 
@@ -503,7 +503,7 @@ if [ "$server_role" = "domaincontroller_backup" ]; then
 	echo -e "\033[60Gdone"
 
 	echo -n "Restart LDAP Server: "
-	/etc/init.d/slapd restart >>/var/log/univention/join.log 2>&1
+	invoke-rc.d slapd restart >>/var/log/univention/join.log 2>&1
 	echo -e "\033[60Gdone"
 
 	#TODO: implement a real sync
@@ -594,7 +594,7 @@ elif [ "$server_role" = "domaincontroller_slave" ]; then
 	fi
 
 	echo -n "Restart LDAP Server: "
-	/etc/init.d/slapd restart >>/var/log/univention/join.log 2>&1
+	invoke-rc.d slapd restart >>/var/log/univention/join.log 2>&1
 	echo -e "\033[60Gdone"
 
 	echo -n "Sync Kerberos settings: "
@@ -737,12 +737,12 @@ else
 fi
 
 if [ -d /etc/runit/univention-directory-notifier ]; then
-	/etc/init.d/univention-directory-notifier restart >>/var/log/univention/join.log 2>&1
+	invoke-rc.d univention-directory-notifier restart >>/var/log/univention/join.log 2>&1
 	sleep 3
 fi
 
 if [ -d /etc/runit/univention-directory-listener ]; then
-	/etc/init.d/univention-directory-listener restart >>/var/log/univention/join.log 2>&1
+	invoke-rc.d univention-directory-listener restart >>/var/log/univention/join.log 2>&1
 fi
 
 if [ -n "$REMOVE_PWD_FILE" -a -n "$DCPWD" ]; then
diff --git a/branches/ucs-3.0/ucs/management/univention-ldap-overlay-memberof/debian/postinst b/branches/ucs-3.0/ucs/management/univention-ldap-overlay-memberof/debian/postinst
index c805e68..385e5df 100644
--- a/branches/ucs-3.0/ucs/management/univention-ldap-overlay-memberof/debian/postinst
+++ b/branches/ucs-3.0/ucs/management/univention-ldap-overlay-memberof/debian/postinst
@@ -47,7 +47,7 @@ if [ ! "$server_role" = "domaincontroller_master" ] ; then
 fi
 
 if [ "$server_role" = "domaincontroller_master" -o "$server_role" = "domaincontroller_backup" -o  "$server_role" = "domaincontroller_slave" ] ; then
-	/etc/init.d/slapd crestart
+	invoke-rc.d slapd crestart
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-client.postinst b/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-client.postinst
index fd90076..effb737 100644
--- a/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-client.postinst
+++ b/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-client.postinst
@@ -33,7 +33,7 @@
 if [ "$1" = configure -a -n "$2" ] && dpkg --compare-versions "$2" lt 1.6; then
 	univention-config-registry set nsswitch/ldap=yes
 
-	test -x /etc/init.d/nscd && /etc/init.d/nscd restart
+	test -x /etc/init.d/nscd && invoke-rc.d nscd restart
 fi
 
 #DEBHELPER#
diff --git a/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-config.postinst b/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-config.postinst
index 628e63e..f80738f 100644
--- a/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-config.postinst
+++ b/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-config.postinst
@@ -38,9 +38,9 @@ then
     server_role=$(ucr get server/role)
     if [ "$server_role" = "domaincontroller_master" ]
 	then
-		/etc/init.d/slapd restart
+		invoke-rc.d slapd restart
     else
-		grep -q crestart /etc/init.d/slapd && /etc/init.d/slapd crestart || true
+		grep -q crestart /etc/init.d/slapd && invoke-rc.d slapd crestart || true
     fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-server.postinst b/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-server.postinst
index 1300b51..e0735c5 100644
--- a/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-server.postinst
+++ b/branches/ucs-3.0/ucs/management/univention-ldap/debian/univention-ldap-server.postinst
@@ -41,14 +41,14 @@ fi
 stop_slapd ()
 {
 	if test -x /etc/init.d/slapd; then
-		/etc/init.d/slapd stop
+		invoke-rc.d slapd stop
 		sleep 1
 	fi
 }
 
 restart_slapd ()
 {
-	/etc/init.d/slapd stop
+	invoke-rc.d slapd stop
 	sleep 1
 	if [ -n "$(pidof slapd)" ]; then
 		killall slapd
@@ -58,7 +58,7 @@ restart_slapd ()
 			sleep 1
 		fi
 	fi
-	/etc/init.d/slapd start
+	invoke-rc.d slapd start
 }
 # } # end of function definitions
 
@@ -168,7 +168,7 @@ if is_ucr_true "ldap/index/autorebuild" ; then
 	{ /usr/sbin/slapindex  2>&1 >&3 | sed -e "/Runnig as root\!/,/There's a fair chance slapd will fail to start./d" >&2; } 3>&1
 
 	if test -x /etc/init.d/slapd; then
-		/etc/init.d/slapd start
+		invoke-rc.d slapd start
 	fi
 else
 	univention-config-registry set ldap/index/eq?"$recommended_ldap_index_eq" \
@@ -201,7 +201,7 @@ if [ "$1" = "configure" -a -n "$2" ];
 			then
 			restart_slapd
 		else
-			#/etc/init.d/slapd crestart
+			#invoke-rc.d slapd crestart
 			if [ -n "$slapd_was_running" ]; then
 				restart_slapd
 			fi
@@ -212,7 +212,7 @@ else
 		then
 		if test -x /etc/init.d/slapd
 			then
-			/etc/init.d/slapd start
+			invoke-rc.d slapd start
 		fi
 	fi
 fi
diff --git a/branches/ucs-3.0/ucs/management/univention-ldap/test/listner-notifier-test b/branches/ucs-3.0/ucs/management/univention-ldap/test/listner-notifier-test
index e48986f..f48834d 100755
--- a/branches/ucs-3.0/ucs/management/univention-ldap/test/listner-notifier-test
+++ b/branches/ucs-3.0/ucs/management/univention-ldap/test/listner-notifier-test
@@ -270,14 +270,14 @@ printf "\b\b\b\b\b\b\b       \n"
 stop () # stopping daemon on remote host using init-script
 {
 echo -e "\v===> stopping $what on $where"
-cmd="/etc/init.d/$what stop"
+cmd="invoke-rc.d $what stop"
 univention-ssh -timeout 60 $pw root@$where $cmd
 }
 
 start () # starting daemon on remote host using init-script
 {
 echo -e "\v===> starting $what on $where"
-cmd="/etc/init.d/$what start"
+cmd="invoke-rc.d $what start"
 univention-ssh -timeout 60 $pw root@$where $cmd
 }
 
@@ -285,7 +285,7 @@ reset ()
 {
 echo -e "\v ------ resetting all needed daemon  ------"
 
-cmd="/etc/init.d/univention-directory-listener start"
+cmd="invoke-rc.d univention-directory-listener start"
 echo -e "\v===>master:"
 univention-ssh -timeout 60 $pw root@$master $cmd
 echo -e "\v===>backup:"
@@ -293,13 +293,13 @@ univention-ssh -timeout 60 $pw root@$backup $cmd
 echo -e "\v===>slave:"
 univention-ssh -timeout 60 $pw root@$slave $cmd
 
-cmd="/etc/init.d/univention-directory-notifier start"
+cmd="invoke-rc.d univention-directory-notifier start"
 echo -e "\v===>master:"
 univention-ssh -timeout 60 $pw root@$master $cmd
 echo -e "\v===>backup:"
 univention-ssh -timeout 60 $pw root@$backup $cmd
 
-cmd="/etc/init.d/slapd start"
+cmd="invoke-rc.d slapd start"
 echo -e "\v===>master"
 univention-ssh -timeout 60 $pw root@$master $cmd
 echo -e "\v===>backup"
diff --git a/branches/ucs-3.0/ucs/management/univention-legacy-kolab-schema/debian/univention-legacy-kolab-schema.postinst b/branches/ucs-3.0/ucs/management/univention-legacy-kolab-schema/debian/univention-legacy-kolab-schema.postinst
index b6f552f..4d3b277 100644
--- a/branches/ucs-3.0/ucs/management/univention-legacy-kolab-schema/debian/univention-legacy-kolab-schema.postinst
+++ b/branches/ucs-3.0/ucs/management/univention-legacy-kolab-schema/debian/univention-legacy-kolab-schema.postinst
@@ -53,15 +53,15 @@ if is_ucr_true "ldap/index/autorebuild" ; then
 	merged_ldap_index_pres="$(merge_csv_unique_sorted "$ldap_index_pres" "$recommended_ldap_index_pres")"
 	merged_ldap_index_approx="$(merge_csv_unique_sorted "$ldap_index_approx" "$recommended_ldap_index_approx")"
 
-	/etc/init.d/slapd stop
+	invoke-rc.d slapd stop
 	univention-config-registry set ldap/index/eq="$merged_ldap_index_eq" \
                                    ldap/index/pres="$merged_ldap_index_pres" \
                                    ldap/index/approx="$merged_ldap_index_approx"
 	# run slapindex and selectively filter out this unsettling warning from stderr
 	{ /usr/sbin/slapindex  2>&1 >&3 | sed -e "/Runnig as root\!/,/There's a fair chance slapd will fail to start./d" >&2; } 3>&1
-	/etc/init.d/slapd start
+	invoke-rc.d slapd start
 else
-	grep -q crestart /etc/init.d/slapd && /etc/init.d/slapd crestart || true
+	grep -q crestart /etc/init.d/slapd && invoke-rc.d slapd crestart || true
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/management/univention-legacy-kolab-schema/debian/univention-legacy-kolab-schema.prerm b/branches/ucs-3.0/ucs/management/univention-legacy-kolab-schema/debian/univention-legacy-kolab-schema.prerm
index 187b88e..cac7ac6 100644
--- a/branches/ucs-3.0/ucs/management/univention-legacy-kolab-schema/debian/univention-legacy-kolab-schema.prerm
+++ b/branches/ucs-3.0/ucs/management/univention-legacy-kolab-schema/debian/univention-legacy-kolab-schema.prerm
@@ -46,15 +46,15 @@ if [ "$1" = "remove" ] ; then
 		filtered_ldap_index_pres="$(filter_csv "$ldap_index_pres" "kolabHomeServer|alias")"
 		filtered_ldap_index_approx="$(filter_csv "$ldap_index_approx" "kolabHomeServer|alias")"
 
-		/etc/init.d/slapd stop
+		invoke-rc.d slapd stop
 		univention-config-registry set ldap/index/eq="$filtered_ldap_index_eq" \
 									   ldap/index/pres="$filtered_ldap_index_pres" \
 									   ldap/index/approx="$filtered_ldap_index_approx"
 		# run slapindex and selectively filter out this unsettling warning from stderr
 		{ /usr/sbin/slapindex  2>&1 >&3 | sed -e "/Runnig as root\!/,/There's a fair chance slapd will fail to start./d" >&2; } 3>&1
-		/etc/init.d/slapd start
+		invoke-rc.d slapd start
 	else
-		grep -q crestart /etc/init.d/slapd && /etc/init.d/slapd crestart || true
+		grep -q crestart /etc/init.d/slapd && invoke-rc.d slapd crestart || true
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/nagios/univention-nagios/28univention-nagios-server.inst b/branches/ucs-3.0/ucs/nagios/univention-nagios/28univention-nagios-server.inst
index 8689ec8..af2ab45 100755
--- a/branches/ucs-3.0/ucs/nagios/univention-nagios/28univention-nagios-server.inst
+++ b/branches/ucs-3.0/ucs/nagios/univention-nagios/28univention-nagios-server.inst
@@ -44,7 +44,7 @@ if [ -x /usr/sbin/univention-certificate-check-validity ]; then
 	fi
 fi
 
-/etc/init.d/nagios3 restart 2> /dev/null > /dev/null || true
+invoke-rc.d nagios3 restart 2> /dev/null > /dev/null || true
 
 univention-directory-manager container/cn create "$@" --ignore_exists --position cn=univention,$ldap_base --set name=console
 univention-directory-manager container/cn create "$@" --ignore_exists --position cn=console,cn=univention,$ldap_base --set name=acls
diff --git a/branches/ucs-3.0/ucs/nagios/univention-nagios/debian/univention-nagios-client.postinst b/branches/ucs-3.0/ucs/nagios/univention-nagios/debian/univention-nagios-client.postinst
index 35da8cf..b451676 100644
--- a/branches/ucs-3.0/ucs/nagios/univention-nagios/debian/univention-nagios-client.postinst
+++ b/branches/ucs-3.0/ucs/nagios/univention-nagios/debian/univention-nagios-client.postinst
@@ -73,11 +73,11 @@ ucr set security/packetfilter/package/univention-nagios-client/tcp/5666/all="ACC
 if [ "$1" = "configure" ]; then
 	if test -f /etc/init.d/univention-directory-listener
 		then
-		/etc/init.d/univention-directory-listener crestart
+		invoke-rc.d univention-directory-listener crestart
 	fi
 fi
 
-/etc/init.d/nagios-nrpe-server restart
+invoke-rc.d nagios-nrpe-server restart
 
 . /usr/share/univention-lib/base.sh
 call_joinscript 30univention-nagios-client.inst
diff --git a/branches/ucs-3.0/ucs/nagios/univention-nagios/debian/univention-nagios-server.postinst b/branches/ucs-3.0/ucs/nagios/univention-nagios/debian/univention-nagios-server.postinst
index f21bd68..6c77200 100644
--- a/branches/ucs-3.0/ucs/nagios/univention-nagios/debian/univention-nagios-server.postinst
+++ b/branches/ucs-3.0/ucs/nagios/univention-nagios/debian/univention-nagios-server.postinst
@@ -102,15 +102,15 @@ fi
 if [ "$1" = "configure" ]; then
 	if test -f /etc/init.d/univention-directory-listener
 		then
-		/etc/init.d/univention-directory-listener crestart
+		invoke-rc.d univention-directory-listener crestart
 	fi
 
 	if test -f /etc/init.d/apache2
 		then
-		/etc/init.d/apache2 restart
+		invoke-rc.d apache2 restart
 	fi
 
-	/etc/init.d/nagios3 restart
+	invoke-rc.d nagios3 restart
 fi
 
 
diff --git a/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0010-2-3-4-5/debian/postinst b/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0010-2-3-4-5/debian/postinst
index a9e0752..cd41fe3 100755
--- a/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0010-2-3-4-5/debian/postinst
+++ b/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0010-2-3-4-5/debian/postinst
@@ -107,7 +107,7 @@ fi
 if [ "$1" = "configure" ]; then
 	if test -f /etc/init.d/univention-directory-listener
 		then
-		/etc/init.d/univention-directory-listener crestart || true
+		invoke-rc.d univention-directory-listener crestart || true
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0011-2-3-4-5-6-7-8/debian/postinst b/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0011-2-3-4-5-6-7-8/debian/postinst
index 1c9f0de..45e62cd 100755
--- a/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0011-2-3-4-5-6-7-8/debian/postinst
+++ b/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0011-2-3-4-5-6-7-8/debian/postinst
@@ -105,7 +105,7 @@ fi
 if [ "$1" = "configure" ]; then
 	if test -f /etc/init.d/univention-directory-listener
 		then
-		/etc/init.d/univention-directory-listener crestart || true
+		invoke-rc.d univention-directory-listener crestart || true
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0013-2/debian/postinst b/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0013-2/debian/postinst
index 1c9f0de..45e62cd 100755
--- a/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0013-2/debian/postinst
+++ b/branches/ucs-3.0/ucs/packaging/ucslint/testframework/0013-2/debian/postinst
@@ -105,7 +105,7 @@ fi
 if [ "$1" = "configure" ]; then
 	if test -f /etc/init.d/univention-directory-listener
 		then
-		/etc/init.d/univention-directory-listener crestart || true
+		invoke-rc.d univention-directory-listener crestart || true
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector-exchange.postinst b/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector-exchange.postinst
index 92ca2dd..e710bfd 100644
--- a/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector-exchange.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector-exchange.postinst
@@ -39,11 +39,11 @@ univention-config-registry set	connector/ad/mapping/user/primarymail=true \
 #DEBHELPER#
 
 if [ -x /etc/init.d/univention-ad-connector ]; then
-    /etc/init.d/univention-ad-connector crestart || true
+    invoke-rc.d univention-ad-connector crestart || true
 fi
 
 if [ -x /etc/init.d/slapd ]; then
-    /etc/init.d/slapd restart || true
+    invoke-rc.d slapd restart || true
 fi
 
 call_joinscript 51univention-ad-connector-exchange.inst
diff --git a/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector.postinst b/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector.postinst
index 364ab51..58c1c9a 100644
--- a/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector.postinst
@@ -54,8 +54,8 @@ if [ ! -d /var/lib/univention-connector/ad ]; then
 	chown 0.0 /var/lib/univention-connector/ad
 fi
 
-/etc/init.d/univention-ad-connector crestart || true
-/etc/init.d/univention-directory-listener crestart || true
+invoke-rc.d univention-ad-connector crestart || true
+invoke-rc.d univention-directory-listener crestart || true
 
 call_joinscript /usr/lib/univention-install/42univention-ad-connector.inst
 
@@ -64,11 +64,11 @@ call_joinscript /usr/lib/univention-install/42univention-ad-connector.inst
 dpkg-statoverride --update --add root www-data 0710 /var/www/univention-ad-connector
 
 if [ -x /etc/init.d/univention-management-console-server ]; then
-	/etc/init.d/univention-management-console-server crestart
+	invoke-rc.d univention-management-console-server crestart
 fi
 
 if [ -x /etc/init.d/apache2 ]; then
-	/etc/init.d/apache2 restart || true
+	invoke-rc.d apache2 restart || true
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector.prerm b/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector.prerm
index c1f9140..0d068f0 100644
--- a/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector.prerm
+++ b/branches/ucs-3.0/ucs/services/univention-ad-connector/debian/univention-ad-connector.prerm
@@ -32,7 +32,7 @@
 
 
 if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
-    test -x /etc/init.d/univention-ad-connector && /etc/init.d/univention-ad-connector stop
+    test -x /etc/init.d/univention-ad-connector && invoke-rc.d univention-ad-connector stop
 fi
 
 #DEBHELPER#
diff --git a/branches/ucs-3.0/ucs/services/univention-ad-connector/scripts/prepare-new-instance b/branches/ucs-3.0/ucs/services/univention-ad-connector/scripts/prepare-new-instance
index 566d1b0..5d921db 100644
--- a/branches/ucs-3.0/ucs/services/univention-ad-connector/scripts/prepare-new-instance
+++ b/branches/ucs-3.0/ucs/services/univention-ad-connector/scripts/prepare-new-instance
@@ -180,7 +180,7 @@ then
     /etc/init.d/univention-ad-"$CONFIGBASENAME" stop
 
     echo "-- stop listener"
-    /etc/init.d/univention-directory-listener stop
+    invoke-rc.d univention-directory-listener stop
 
     echo "-- unregister initscript"
     update-rc.d -f univention-ad-"$CONFIGBASENAME" remove
@@ -221,6 +221,6 @@ then
     rm -r /var/lib/univention-"$CONFIGBASENAME"
 
     echo "-- start listener"
-    /etc/init.d/univention-directory-listener start
+    invoke-rc.d univention-directory-listener start
 
 fi
diff --git a/branches/ucs-3.0/ucs/services/univention-apache/08univention-apache.inst b/branches/ucs-3.0/ucs/services/univention-apache/08univention-apache.inst
index baf13b8..4ee12ca 100755
--- a/branches/ucs-3.0/ucs/services/univention-apache/08univention-apache.inst
+++ b/branches/ucs-3.0/ucs/services/univention-apache/08univention-apache.inst
@@ -45,7 +45,7 @@ a2dismod ssl
 a2enmod ssl
 
 if [ -z "$UMC_MODE" ]; then
-	/etc/init.d/apache2 force-reload
+	invoke-rc.d apache2 force-reload
 fi
 
 test -n "`grep "univention-apache v${VERSION} successful" /usr/lib/univention-install/.index.txt`" || echo "univention-apache v${VERSION} successful" >>/usr/lib/univention-install/.index.txt
diff --git a/branches/ucs-3.0/ucs/services/univention-apache/debian/univention-apache.postinst b/branches/ucs-3.0/ucs/services/univention-apache/debian/univention-apache.postinst
index 7800723..b19ab3e 100644
--- a/branches/ucs-3.0/ucs/services/univention-apache/debian/univention-apache.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-apache/debian/univention-apache.postinst
@@ -82,9 +82,9 @@ fi
 
 if [ -x /etc/init.d/apache2 ]; then
 	# better stop&start, as this behaves differently to restart
-	/etc/init.d/apache2 stop
+	invoke-rc.d apache2 stop
 	sleep 3
-	/etc/init.d/apache2 start
+	invoke-rc.d apache2 start
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/services/univention-apache/univention/postinst b/branches/ucs-3.0/ucs/services/univention-apache/univention/postinst
index 95a20b8..c99d134 100644
--- a/branches/ucs-3.0/ucs/services/univention-apache/univention/postinst
+++ b/branches/ucs-3.0/ucs/services/univention-apache/univention/postinst
@@ -29,4 +29,4 @@
 # /usr/share/common-licenses/AGPL-3; if not, see
 # <http://www.gnu.org/licenses/>.
 
-/etc/init.d/apache start
+invoke-rc.d apache start
diff --git a/branches/ucs-3.0/ucs/services/univention-apache/univention/preinst b/branches/ucs-3.0/ucs/services/univention-apache/univention/preinst
index d8fa44a..80b7533 100644
--- a/branches/ucs-3.0/ucs/services/univention-apache/univention/preinst
+++ b/branches/ucs-3.0/ucs/services/univention-apache/univention/preinst
@@ -30,4 +30,4 @@
 # /usr/share/common-licenses/AGPL-3; if not, see
 # <http://www.gnu.org/licenses/>.
 
-/etc/init.d/apache stop || true
+invoke-rc.d apache stop || true
diff --git a/branches/ucs-3.0/ucs/services/univention-bind/90univention-bind-post.inst b/branches/ucs-3.0/ucs/services/univention-bind/90univention-bind-post.inst
index d9ad5c6..00446c3 100755
--- a/branches/ucs-3.0/ucs/services/univention-bind/90univention-bind-post.inst
+++ b/branches/ucs-3.0/ucs/services/univention-bind/90univention-bind-post.inst
@@ -119,7 +119,7 @@ if [ $JS_LAST_EXECUTED_VERSION = 0 ]; then
 fi
 
 # Restart the bind9 daemon and wait for a few seconds
-/etc/init.d/bind9 restart
+invoke-rc.d bind9 restart
 wait_for_dns
 
 old=`univention-directory-manager policies/dhcp_dns list "$@" --filter cn=default-settings | grep domain_name_servers | sed -e 's|.*domain_name_servers: ||'`
diff --git a/branches/ucs-3.0/ucs/services/univention-bind/debian/univention-bind-proxy.postinst b/branches/ucs-3.0/ucs/services/univention-bind/debian/univention-bind-proxy.postinst
index ebaf8af..f204bba 100644
--- a/branches/ucs-3.0/ucs/services/univention-bind/debian/univention-bind-proxy.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-bind/debian/univention-bind-proxy.postinst
@@ -31,7 +31,7 @@
 # <http://www.gnu.org/licenses/>.
 
 if [ -x /etc/init.d/bind9 ]; then
-	/etc/init.d/bind9 stop
+	invoke-rc.d bind9 stop
 fi
 
 #DEBHELPER#
@@ -39,7 +39,7 @@ fi
 univention-config-registry set nameserver/external?false
 
 if [ "$1" = "configure" -a -n "$2" ]; then
-	/etc/init.d/univention-bind-proxy crestart
+	invoke-rc.d univention-bind-proxy crestart
 else
 	if [ "$1" = "configure" ]
 		then
@@ -51,7 +51,7 @@ else
 		  count=$((count+1))
 		done
 		# runsv has 10 seconds to sync, if it hasn't there will be a warning
-		/etc/init.d/univention-bind-proxy start
+		invoke-rc.d univention-bind-proxy start
 	fi
 fi
 
@@ -59,7 +59,7 @@ if [ "$1" = "configure" ]
 	then
 	if test -f /etc/init.d/univention-directory-listener
 		then
-		/etc/init.d/univention-directory-listener crestart
+		invoke-rc.d univention-directory-listener crestart
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/services/univention-bind/debian/univention-bind.postinst b/branches/ucs-3.0/ucs/services/univention-bind/debian/univention-bind.postinst
index 0792595..343164d 100644
--- a/branches/ucs-3.0/ucs/services/univention-bind/debian/univention-bind.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-bind/debian/univention-bind.postinst
@@ -62,14 +62,14 @@ fi
 
 if [ "$1" = "configure" ]; then
 	if [ -n "$2" ]; then
-		/etc/init.d/bind9 crestart
+		invoke-rc.d bind9 crestart
 	else
 		echo "# add local zones here" >> /etc/bind/local.conf
 		echo "# add local zones here" >> /etc/bind/local.conf.proxy
 		echo "# add local zones here" >> /etc/bind/local.conf.samba4
-		/etc/init.d/bind9 start
+		invoke-rc.d bind9 start
 	fi
-	/etc/init.d/univention-directory-listener crestart
+	invoke-rc.d univention-directory-listener crestart
 fi
 
 call_joinscript 05univention-bind.inst
diff --git a/branches/ucs-3.0/ucs/services/univention-bind/usr/lib/univention-server/server_password_change.d/univention-bind b/branches/ucs-3.0/ucs/services/univention-bind/usr/lib/univention-server/server_password_change.d/univention-bind
index 13fe278..8713d7c 100755
--- a/branches/ucs-3.0/ucs/services/univention-bind/usr/lib/univention-server/server_password_change.d/univention-bind
+++ b/branches/ucs-3.0/ucs/services/univention-bind/usr/lib/univention-server/server_password_change.d/univention-bind
@@ -42,7 +42,7 @@ if [ "$1" = "prechange" ] ; then
 		if /etc/init.d/bind9 status | grep -q "is running" ; then
 			univention-config-registry set dns/bind9/stoppedbyserverpasswordchange=yes >/dev/null
 			echo "stopping bind9 due to upcoming server password change" | logger -t "server-password-change"
-			/etc/init.d/bind9 stop >/dev/null
+			invoke-rc.d bind9 stop >/dev/null
 		fi
 	fi
 fi
@@ -55,7 +55,7 @@ if [ "$1" = "postchange" ] ; then
 		# start bind9 only if it has been stopped by this script
 		if [ "$dns_bind9_stoppedbyserverpasswordchange" = "yes" ] ; then
 			echo "starting bind9 after server password change" | logger -t "server-password-change"
-			/etc/init.d/bind9 start >/dev/null
+			invoke-rc.d bind9 start >/dev/null
 			univention-config-registry unset dns/bind9/stoppedbyserverpasswordchange >/dev/null
 		fi
 	fi
diff --git a/branches/ucs-3.0/ucs/services/univention-dansguardian/debian/univention-dansguardian.postinst b/branches/ucs-3.0/ucs/services/univention-dansguardian/debian/univention-dansguardian.postinst
index 5878220..84c8271 100644
--- a/branches/ucs-3.0/ucs/services/univention-dansguardian/debian/univention-dansguardian.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-dansguardian/debian/univention-dansguardian.postinst
@@ -38,7 +38,7 @@
 ucr set squid/virusscan?yes
 ucr set squid/contentscan?yes
 
-/etc/init.d/squid3 restart
+invoke-rc.d squid3 restart
 
 eval "$(ucr shell squid/virusscan squid/contentscan)"
 
@@ -47,15 +47,15 @@ if [ "$squid_virusscan" = yes -o "$squid_contentscan" = yes ]; then
 	if [ -x /etc/init.d/clamav-freshclam ]; then
 		# if freshclam is active stop it for a second to avoid locking problem on /var/lib/clamav
 		/etc/init.d/clamav-freshclam status | grep -q "is running" && freshclam_active=1
-		[ "$freshclam_active" = 1 ] && /etc/init.d/clamav-freshclam stop
+		[ "$freshclam_active" = 1 ] && invoke-rc.d clamav-freshclam stop
 	fi
-	/etc/init.d/dansguardian restart
-	[ "$freshclam_active" = 1 ] && /etc/init.d/clamav-freshclam start
+	invoke-rc.d dansguardian restart
+	[ "$freshclam_active" = 1 ] && invoke-rc.d clamav-freshclam start
 fi
 
 call_joinscript 79univention-dansguardian.inst
 
-/etc/init.d/univention-directory-listener crestart
+invoke-rc.d univention-directory-listener crestart
 
 # default group for web access
 ucr set dansguardian/groups?www-access
diff --git a/branches/ucs-3.0/ucs/services/univention-local-users/debian/univention-local-users.postinst b/branches/ucs-3.0/ucs/services/univention-local-users/debian/univention-local-users.postinst
index 4015aeb..6ed6f2e 100644
--- a/branches/ucs-3.0/ucs/services/univention-local-users/debian/univention-local-users.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-local-users/debian/univention-local-users.postinst
@@ -36,7 +36,7 @@ univention-config-registry set local-user-sync/passwd?true
 #DEBHELPER#
 
 if [ -x /etc/init.d/univention-directory-listener ]; then
-	/etc/init.d/univention-directory-listener crestart
+	invoke-rc.d univention-directory-listener crestart
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/services/univention-net-installer/debian/postinst b/branches/ucs-3.0/ucs/services/univention-net-installer/debian/postinst
index 8897351..39fd2bd 100644
--- a/branches/ucs-3.0/ucs/services/univention-net-installer/debian/postinst
+++ b/branches/ucs-3.0/ucs/services/univention-net-installer/debian/postinst
@@ -54,7 +54,7 @@ call_joinscript 81univention-net-installer.inst
 
 if test -f /etc/init.d/univention-directory-listener
 	then
-	/etc/init.d/univention-directory-listener crestart
+	invoke-rc.d univention-directory-listener crestart
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/branches/ucs-3.0/ucs/services/univention-nfs/debian/postinst b/branches/ucs-3.0/ucs/services/univention-nfs/debian/postinst
index 7e241b3..a726ca0 100644
--- a/branches/ucs-3.0/ucs/services/univention-nfs/debian/postinst
+++ b/branches/ucs-3.0/ucs/services/univention-nfs/debian/postinst
@@ -61,7 +61,7 @@ ucr set security/packetfilter/package/univention-nfs/tcp/111/all="ACCEPT" \
 if [ "$1" = "configure" ]; then
 	if test -f /etc/init.d/univention-directory-listener
 		then
-		/etc/init.d/univention-directory-listener crestart
+		invoke-rc.d univention-directory-listener crestart
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/services/univention-pkgdb/debian/univention-pkgdb.postinst b/branches/ucs-3.0/ucs/services/univention-pkgdb/debian/univention-pkgdb.postinst
index 58cdbcb..b929496 100644
--- a/branches/ucs-3.0/ucs/services/univention-pkgdb/debian/univention-pkgdb.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-pkgdb/debian/univention-pkgdb.postinst
@@ -68,7 +68,7 @@ if [ "$server_role" = "domaincontroller_master" -o "$server_role" = "domaincontr
 fi
 
 if [ -x "/etc/init.d/univention-directory-listener" ]; then
-  /etc/init.d/univention-directory-listener crestart
+  invoke-rc.d univention-directory-listener crestart
 fi
 
 if [ ! -e /var/log/univention/pkgdb.log ]; then
@@ -78,7 +78,7 @@ if [ ! -e /var/log/univention/pkgdb.log ]; then
 fi
 
 if [ -x "/etc/init.d/univention-management-console-server" ] ; then
-	/etc/init.d/univention-management-console-server crestart || true
+	invoke-rc.d univention-management-console-server crestart || true
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/services/univention-printquota/debian/univention-printquota.postinst b/branches/ucs-3.0/ucs/services/univention-printquota/debian/univention-printquota.postinst
index c50e8f6..a198aaa 100644
--- a/branches/ucs-3.0/ucs/services/univention-printquota/debian/univention-printquota.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-printquota/debian/univention-printquota.postinst
@@ -44,13 +44,13 @@ chmod -R g+rw /etc/pykota
 dpkg-statoverride --update --add root root 700 /usr/share/pykota/cupspykota >/dev/null || true
 
 adduser lp pykota
-/etc/init.d/cups restart
+invoke-rc.d cups restart
 
 univention-config-registry set pykota/policy/debug?1
 
 if [ "$1" = "configure" ]; then
 	if test -f /etc/init.d/univention-directory-listener; then
-	/etc/init.d/univention-directory-listener crestart
+	invoke-rc.d univention-directory-listener crestart
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/services/univention-printquota/debian/univention-printquotadb.postinst b/branches/ucs-3.0/ucs/services/univention-printquota/debian/univention-printquotadb.postinst
index d91ebbc..8178623 100644
--- a/branches/ucs-3.0/ucs/services/univention-printquota/debian/univention-printquotadb.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-printquota/debian/univention-printquotadb.postinst
@@ -33,15 +33,15 @@
 #DEBHELPER#
 
 if [ -x /etc/init.d/postgresql ]; then
-	/etc/init.d/postgresql reload
+	invoke-rc.d postgresql reload
 fi
 
 if [ -x /etc/init.d/postgresql-7.4 ]; then
-	/etc/init.d/postgresql-7.4 reload
+	invoke-rc.d postgresql-7.4 reload
 fi
 
 if [ -x /etc/init.d/postgresql-8.3 ]; then
-	/etc/init.d/postgresql-8.3 reload
+	invoke-rc.d postgresql-8.3 reload
 fi
 
 eval "$(univention-config-registry shell)"
diff --git a/branches/ucs-3.0/ucs/services/univention-printserver/debian/univention-printserver-pdf.postinst b/branches/ucs-3.0/ucs/services/univention-printserver/debian/univention-printserver-pdf.postinst
index fb1d747..b2ed533 100644
--- a/branches/ucs-3.0/ucs/services/univention-printserver/debian/univention-printserver-pdf.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-printserver/debian/univention-printserver-pdf.postinst
@@ -49,7 +49,7 @@ dpkg-statoverride --add --force --update root sys 4754 /usr/lib/cups/backend/cup
 if [ "$1" = "configure" ]; then
         if test -f /etc/init.d/univention-directory-listener
                 then
-                /etc/init.d/univention-directory-listener crestart
+                invoke-rc.d univention-directory-listener crestart
         fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/services/univention-printserver/debian/univention-printserver.postinst b/branches/ucs-3.0/ucs/services/univention-printserver/debian/univention-printserver.postinst
index 35f7e6d..3a9008d 100644
--- a/branches/ucs-3.0/ucs/services/univention-printserver/debian/univention-printserver.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-printserver/debian/univention-printserver.postinst
@@ -62,7 +62,7 @@ fi
 if [ "$1" = "configure" ]; then
 	if test -f /etc/init.d/univention-directory-listener
 		then
-		/etc/init.d/univention-directory-listener crestart
+		invoke-rc.d univention-directory-listener crestart
 	fi
 
 fi
@@ -76,11 +76,11 @@ if [ ! -e "/etc/cups/classes.conf" ]; then
 fi
 
 if [ -x "/etc/init.d/cups" ]; then
-	/etc/init.d/cups restart
+	invoke-rc.d cups restart
 fi
 
 if [ -x /etc/init.d/univention-management-console-server ]; then
-	/etc/init.d/univention-management-console-server crestart
+	invoke-rc.d univention-management-console-server crestart
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/services/univention-s4-connector/97univention-s4-connector.inst b/branches/ucs-3.0/ucs/services/univention-s4-connector/97univention-s4-connector.inst
index 9587b88..7ef8a5f 100644
--- a/branches/ucs-3.0/ucs/services/univention-s4-connector/97univention-s4-connector.inst
+++ b/branches/ucs-3.0/ucs/services/univention-s4-connector/97univention-s4-connector.inst
@@ -97,7 +97,7 @@ else										## we are first system to provide this service
 
 fi
 
-/etc/init.d/univention-s4-connector restart
+invoke-rc.d univention-s4-connector restart
 
 ## run 98univention-samba4-dns.inst to switch the dns/backend
 call_joinscript 98univention-samba4-dns.inst
diff --git a/branches/ucs-3.0/ucs/services/univention-s4-connector/debian/univention-s4-connector.postinst b/branches/ucs-3.0/ucs/services/univention-s4-connector/debian/univention-s4-connector.postinst
index 2a281fa..09c6515 100644
--- a/branches/ucs-3.0/ucs/services/univention-s4-connector/debian/univention-s4-connector.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-s4-connector/debian/univention-s4-connector.postinst
@@ -52,12 +52,12 @@ if [ ! -d /var/lib/univention-connector/s4 ]; then
 	chown 0.0 /var/lib/univention-connector/s4
 fi
 
-/etc/init.d/univention-directory-listener crestart || true
+invoke-rc.d univention-directory-listener crestart || true
 
 call_joinscript 97univention-s4-connector.inst
 
 if [ -x /etc/init.d/univention-s4-connector ]; then
-	/etc/init.d/univention-s4-connector restart
+	invoke-rc.d univention-s4-connector restart
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/services/univention-samba/26univention-samba.inst b/branches/ucs-3.0/ucs/services/univention-samba/26univention-samba.inst
index d82a771..e7b8a88 100755
--- a/branches/ucs-3.0/ucs/services/univention-samba/26univention-samba.inst
+++ b/branches/ucs-3.0/ucs/services/univention-samba/26univention-samba.inst
@@ -75,7 +75,7 @@ univention-config-registry set samba/autostart?yes
 # Stop the NFS Kernel Server
 nfsd_pid=`pidof nfsd`
 if [ -n "$nfsd_pid" ]; then
-	test -x /etc/init.d/nfs-kernel-server && /etc/init.d/nfs-kernel-server stop
+	test -x /etc/init.d/nfs-kernel-server && invoke-rc.d nfs-kernel-server stop
 fi
 
 winbind_was_running=0
@@ -84,7 +84,7 @@ if [ -x /etc/init.d/winbind ]; then
 		winbind_was_running=1
 	fi
 
-	/etc/init.d/winbind stop
+	invoke-rc.d winbind stop
 fi
 
 if [ "$server_role" = "domaincontroller_slave" -o "$server_role" = "memberserver" ]; then
@@ -100,7 +100,7 @@ if [ "$server_role" = "domaincontroller_slave" -o "$server_role" = "memberserver
 else
 	univention-config-registry set	samba/user?"cn=admin,$ldap_base" \
 									samba/user/pwdfile?"/etc/ldap.secret"
-	/etc/init.d/samba restart >/dev/null 2>&1
+	invoke-rc.d samba restart >/dev/null 2>&1
 
 	smbpasswd -w $(cat /etc/ldap.secret)
 
@@ -113,7 +113,7 @@ fi
 eval "$(univention-config-registry shell samba/user/pwdfile samba/user)"
 
 # The samba server should be up and running for local join
-/etc/init.d/samba restart
+invoke-rc.d samba restart
 sleep 3
 
 # parse binddn and bindpwd from command line arguments into shell variables
@@ -161,7 +161,7 @@ fi
 restart=0
 samba_pid=`pidof smbd`
 if [ -n "$samba_pid" ]; then
-	/etc/init.d/samba stop >/dev/null 2>&1
+	invoke-rc.d samba stop >/dev/null 2>&1
 	killall smbd nmbd >/dev/null 2>&1
 fi
 
@@ -189,14 +189,14 @@ if [ -n "$create_home_share" -a "$create_home_share" = "true" ]; then
 fi
 
 
-/etc/init.d/samba restart >/dev/null 2>&1
+invoke-rc.d samba restart >/dev/null 2>&1
 
 if [ -n "$nfsd_pid" ]; then
-	test -x /etc/init.d/nfs-kernel-server && /etc/init.d/nfs-kernel-server start
+	test -x /etc/init.d/nfs-kernel-server && invoke-rc.d nfs-kernel-server start
 fi
 
 if [ $winbind_was_running -eq 1 ]; then
-	/etc/init.d/winbind start >/dev/null 2>&1
+	invoke-rc.d winbind start >/dev/null 2>&1
 fi
 
 ucs_addServiceToLocalhost 'Samba 3' "$@"
diff --git a/branches/ucs-3.0/ucs/services/univention-samba/debian/postinst b/branches/ucs-3.0/ucs/services/univention-samba/debian/postinst
index 644fe2d..3e9541b 100644
--- a/branches/ucs-3.0/ucs/services/univention-samba/debian/postinst
+++ b/branches/ucs-3.0/ucs/services/univention-samba/debian/postinst
@@ -132,12 +132,12 @@ if [ "$1" = "configure" ]; then
 			univention-config-registry set windows/wins-server?$ldap_master
 		fi
 	elif [ -n "$2" ]; then
-		/etc/init.d/samba crestart
+		invoke-rc.d samba crestart
 	fi
 
 
 	if test -f /etc/init.d/univention-directory-listener; then
-		/etc/init.d/univention-directory-listener crestart
+		invoke-rc.d univention-directory-listener crestart
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/services/univention-samba/debian/univention-samba-slave-pdc.postinst b/branches/ucs-3.0/ucs/services/univention-samba/debian/univention-samba-slave-pdc.postinst
index 18dbf83..53a0e2c 100644
--- a/branches/ucs-3.0/ucs/services/univention-samba/debian/univention-samba-slave-pdc.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-samba/debian/univention-samba-slave-pdc.postinst
@@ -39,9 +39,9 @@ univention-config-registry set windows/wins-support=yes \
 
 if [ "$1" = "configure" ]; then
 	if [ -n "$2" ]; then
-		/etc/init.d/samba crestart
+		invoke-rc.d samba crestart
 	elif [ -x /etc/init.d/samba ]; then
-		/etc/init.d/samba start
+		invoke-rc.d samba start
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/services/univention-samba4/96univention-samba4.inst b/branches/ucs-3.0/ucs/services/univention-samba4/96univention-samba4.inst
index 8850418..05a89fe 100755
--- a/branches/ucs-3.0/ucs/services/univention-samba4/96univention-samba4.inst
+++ b/branches/ucs-3.0/ucs/services/univention-samba4/96univention-samba4.inst
@@ -141,15 +141,15 @@ univention-config-registry set samba/quota/command='None'	# currently unsupporte
 
 ## stop samba3 services and heimdal-kdc if present
 if [ -x /etc/init.d/samba ]; then
-	/etc/init.d/samba stop
+	invoke-rc.d samba stop
 	univention-config-registry set samba/autostart=no
 fi
 if [ -x /etc/init.d/winbind ]; then
-	/etc/init.d/winbind stop
+	invoke-rc.d winbind stop
 	univention-config-registry set winbind/autostart=no
 fi
 if [ -x /etc/init.d/heimdal-kdc ]; then
-	/etc/init.d/heimdal-kdc stop
+	invoke-rc.d heimdal-kdc stop
 	univention-config-registry set kerberos/autostart=no
 fi
 
@@ -187,7 +187,7 @@ if [ "$samba4_role" = 'DC' ]; then
 	## check if we there already is a **domaincontroller** providing the service "Samba 4"
 	samba4servicedcs=$(ldapsearch -ZZ -LLL -D "$ldap_hostdn" -y /etc/machine.secret "(&(univentionService=${NAME})(objectClass=univentionDomainController))" cn | sed -n 's/^cn: \(.*\)/\1/p')	## currently there is no u-d-m module computers/dc
 
-	/etc/init.d/samba4 stop
+	invoke-rc.d samba4 stop
 
 	if [ -z "$samba4servicedcs" ]; then	## we are the first domainctontroller to provide this service
 
@@ -204,7 +204,7 @@ if [ "$samba4_role" = 'DC' ]; then
 		operatingSystem_attribute replace
 
 		## Start samba daemon
-		/etc/init.d/samba4 start
+		invoke-rc.d samba4 start
 
 	else	## otherwise we will simply join the new DC
 
@@ -217,7 +217,7 @@ if [ "$samba4_role" = 'DC' ]; then
 				univention-config-registry set slapd/port/ldaps="$(remove_port "$slapd_port_ldaps" 636)"
 			fi
 
-			/etc/init.d/slapd crestart
+			invoke-rc.d slapd crestart
 			sleep 1
 		fi
 
@@ -241,7 +241,7 @@ if [ "$samba4_role" = 'DC' ]; then
 		fi
 
 		## Start samba daemon
-		/etc/init.d/samba4 start
+		invoke-rc.d samba4 start
 
 		## set the predefined NTACL which the provision uses on sysvol
 		/usr/share/univention-samba4/scripts/set_sysvol_ntacl.py "$SYSVOL_PATH" 2>/dev/null
@@ -282,7 +282,7 @@ elif [ "$samba4_role" = "RODC" ]; then
 	samba4_ldap_base="DC=$(echo "$kerberos_realm" | sed 's/\./,DC=/g')"
 	univention-config-registry set samba4/ldap/base="$samba4_ldap_base"
 
-	/etc/init.d/samba4 stop
+	invoke-rc.d samba4 stop
 
 	if [ $JS_LAST_EXECUTED_VERSION -lt 1 ]; then
 		## remove slapd from port 389 on upgrade
@@ -293,7 +293,7 @@ elif [ "$samba4_role" = "RODC" ]; then
 			univention-config-registry set slapd/port/ldaps="$(remove_port "$slapd_port_ldaps" 636)"
 		fi
 
-		/etc/init.d/slapd crestart
+		invoke-rc.d slapd crestart
 		sleep 1
 	fi
 
@@ -331,7 +331,7 @@ elif [ "$samba4_role" = "RODC" ]; then
 	fi
 
 	## Start samba daemon
-	/etc/init.d/samba4 start
+	invoke-rc.d samba4 start
 
 	## set the predefined NTACL which the provision uses on sysvol
 	/usr/share/univention-samba4/scripts/set_sysvol_ntacl.py "$SYSVOL_PATH"	2>/dev/null
@@ -364,7 +364,7 @@ fi
 ## provision erases the idmap.ldb
 /usr/lib/univention-directory-listener/system/samba4-idmap.py --direct-resync 2>/dev/null
 
-/etc/init.d/samba4 restart
+invoke-rc.d samba4 restart
 
 ucs_addServiceToLocalhost "${NAME}" "$@"
 
diff --git a/branches/ucs-3.0/ucs/services/univention-samba4/98univention-samba4-dns.inst b/branches/ucs-3.0/ucs/services/univention-samba4/98univention-samba4-dns.inst
index bde461b..e149980 100644
--- a/branches/ucs-3.0/ucs/services/univention-samba4/98univention-samba4-dns.inst
+++ b/branches/ucs-3.0/ucs/services/univention-samba4/98univention-samba4-dns.inst
@@ -41,7 +41,7 @@ eval "$(univention-config-registry shell)"
 if [ $JS_LAST_EXECUTED_VERSION = 0 ]; then
 	univention-config-registry set dns/backend=samba4
 	if [ -x /etc/init.d/bind9 ]; then
-		/etc/init.d/bind9 restart
+		invoke-rc.d bind9 restart
 	fi
 
 	# Wait until the local S4 contains the DNS record
diff --git a/branches/ucs-3.0/ucs/services/univention-samba4/debian/univention-samba4.postinst b/branches/ucs-3.0/ucs/services/univention-samba4/debian/univention-samba4.postinst
index 3f2cbad..d640479 100644
--- a/branches/ucs-3.0/ucs/services/univention-samba4/debian/univention-samba4.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-samba4/debian/univention-samba4.postinst
@@ -119,14 +119,14 @@ if [ "$1" = "configure" ]; then
 		if [ -r /var/run/samba.pid ]; then
 			processname=$(ps -p $(cat /var/run/samba.pid) -o comm= )
 			if [ "$processname" = 'samba' ]; then
-				/etc/init.d/samba4 restart
+				invoke-rc.d samba4 restart
 			fi
 		fi
 
 	fi
 
 	if test -f /etc/init.d/univention-directory-listener; then
-		/etc/init.d/univention-directory-listener crestart
+		invoke-rc.d univention-directory-listener crestart
 	fi
 fi
 
diff --git a/branches/ucs-3.0/ucs/services/univention-samba4/debian/univention-samba4.prerm b/branches/ucs-3.0/ucs/services/univention-samba4/debian/univention-samba4.prerm
index 8190808..f8e5d34 100644
--- a/branches/ucs-3.0/ucs/services/univention-samba4/debian/univention-samba4.prerm
+++ b/branches/ucs-3.0/ucs/services/univention-samba4/debian/univention-samba4.prerm
@@ -58,7 +58,7 @@ if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
 	fi
 
 	if [ -x /etc/init.d/slapd ]; then
-		/etc/init.d/slapd restart
+		invoke-rc.d slapd restart
 	fi
 		
 fi
diff --git a/branches/ucs-3.0/ucs/services/univention-samba4/scripts/setup-s4.sh b/branches/ucs-3.0/ucs/services/univention-samba4/scripts/setup-s4.sh
index 2dd0892..63c1b92 100755
--- a/branches/ucs-3.0/ucs/services/univention-samba4/scripts/setup-s4.sh
+++ b/branches/ucs-3.0/ucs/services/univention-samba4/scripts/setup-s4.sh
@@ -114,22 +114,22 @@ fi
 
 ## restart processes with adjusted ports
 stop_udm_cli_server
-/etc/init.d/slapd restart 2>&1 | tee -a "$LOGFILE"
-/etc/init.d/univention-directory-listener restart 2>&1 | tee -a "$LOGFILE"
-/etc/init.d/univention-management-console-server restart 2>&1 | tee -a "$LOGFILE"
+invoke-rc.d slapd restart 2>&1 | tee -a "$LOGFILE"
+invoke-rc.d univention-directory-listener restart 2>&1 | tee -a "$LOGFILE"
+invoke-rc.d univention-management-console-server restart 2>&1 | tee -a "$LOGFILE"
 
 ## Provision Samba4
 eval "$(univention-config-registry shell)"
 
 if [ -x /etc/init.d/samba ]; then
-	/etc/init.d/samba stop 2>&1 | tee -a "$LOGFILE"
+	invoke-rc.d samba stop 2>&1 | tee -a "$LOGFILE"
 fi
 if [ -x /etc/init.d/winbind ]; then
-	/etc/init.d/winbind stop 2>&1 | tee -a "$LOGFILE"
+	invoke-rc.d winbind stop 2>&1 | tee -a "$LOGFILE"
 fi
 univention-config-registry set samba/autostart=no winbind/autostart=no 2>&1 | tee -a "$LOGFILE"
 
-/etc/init.d/heimdal-kdc stop 2>&1 | tee -a "$LOGFILE"
+invoke-rc.d heimdal-kdc stop 2>&1 | tee -a "$LOGFILE"
 univention-config-registry set kerberos/autostart=no 2>&1 | tee -a "$LOGFILE"
 
 if [ ! -e /usr/modules ]; then
diff --git a/branches/ucs-3.0/ucs/services/univention-sasl/debian/univention-sasl.postinst b/branches/ucs-3.0/ucs/services/univention-sasl/debian/univention-sasl.postinst
index f703090..3dc2d17 100644
--- a/branches/ucs-3.0/ucs/services/univention-sasl/debian/univention-sasl.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-sasl/debian/univention-sasl.postinst
@@ -34,7 +34,7 @@ eval "$(ucr shell)"
 univention-config-registry set mail/saslauthd/threads?5
 
 if [ -x /etc/init.d/saslauthd ]; then
-	/etc/init.d/saslauthd restart
+	invoke-rc.d saslauthd restart
 fi
 
 #DEBHELPER#
diff --git a/branches/ucs-3.0/ucs/services/univention-shares/debian/postinst b/branches/ucs-3.0/ucs/services/univention-shares/debian/postinst
index 58836ca..c14b702 100644
--- a/branches/ucs-3.0/ucs/services/univention-shares/debian/postinst
+++ b/branches/ucs-3.0/ucs/services/univention-shares/debian/postinst
@@ -37,7 +37,7 @@
 create_logfile_if_missing /var/log/univention/share-replication.log "root:adm" 640
 
 if [ "$1" = "configure" -a -n "$2" ]; then
-	/etc/init.d/univention-directory-listener crestart
+	invoke-rc.d univention-directory-listener crestart
 fi
 
 exit 0
diff --git a/branches/ucs-3.0/ucs/services/univention-squid/debian/univention-squid.postinst b/branches/ucs-3.0/ucs/services/univention-squid/debian/univention-squid.postinst
index f6259a9..e73bbbf 100644
--- a/branches/ucs-3.0/ucs/services/univention-squid/debian/univention-squid.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-squid/debian/univention-squid.postinst
@@ -62,8 +62,8 @@ cp /etc/machine.secret "$dest"
 chown proxy:root "$dest"
 chmod 600  "$dest"
 
-/etc/init.d/squid3 stop
-/etc/init.d/squid3 start
+invoke-rc.d squid3 stop
+invoke-rc.d squid3 start
 
 # configure firewall
 ucr set security/packetfilter/package/univention-squid/tcp/3128/all="ACCEPT" \
diff --git a/branches/ucs-3.0/ucs/services/univention-tftp/debian/univention-tftp.postinst b/branches/ucs-3.0/ucs/services/univention-tftp/debian/univention-tftp.postinst
index 125cd26..4d18f55 100755
--- a/branches/ucs-3.0/ucs/services/univention-tftp/debian/univention-tftp.postinst
+++ b/branches/ucs-3.0/ucs/services/univention-tftp/debian/univention-tftp.postinst
@@ -33,14 +33,14 @@
 . /usr/share/univention-lib/all.sh
 
 if [ -e "/etc/init.d/atftpd" ]; then
-	/etc/init.d/atftpd stop
+	invoke-rc.d atftpd stop
 fi;
 
 update-inetd --group BOOT --remove "tftp"
 update-inetd --group BOOT --add "tftp               dgram   udp     wait \
         nobody /usr/sbin/tcpd /usr/sbin/in.tftpd --tftpd-timeout 300 --retry-timeout 5 --maxthread 100 --verbose=5  /var/lib/univention-client-boot/"
 
-/etc/init.d/atftpd start
+invoke-rc.d atftpd start
 
 remove_ucr_template /etc/default/atftpd.conf
 
diff --git a/branches/ucs-3.0/ucs/virtualization/xen-4.1/debian/xen-4.1.postinst b/branches/ucs-3.0/ucs/virtualization/xen-4.1/debian/xen-4.1.postinst
index 8f4cecb..0f21299 100644
--- a/branches/ucs-3.0/ucs/virtualization/xen-4.1/debian/xen-4.1.postinst
+++ b/branches/ucs-3.0/ucs/virtualization/xen-4.1/debian/xen-4.1.postinst
@@ -6,16 +6,12 @@
 
 # restart udev
 if [ -x /etc/init.d/udev ]; then
-	/etc/init.d/udev restart
+	invoke-rc.d udev restart
 fi
 
 if [ -x "/etc/init.d/xend" ]; then
-        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                invoke-rc.d xend stop || exit $?
-        else
-                /etc/init.d/xend stop || exit $?
-        fi
-        update-rc.d -f xend remove >/dev/null
+	invoke-rc.d xend stop || exit $?
+	update-rc.d -f xend remove >/dev/null
 fi
 
 if [ -x "/etc/init.d/xendomains" ]; then