[Pkg-utopia-commits] r3653 - in /packages/unstable/dbus/debian: changelog dbus.init

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Jul 17 12:14:12 2010
New Revision: 3653

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3653
Log:
Stop restarting dependent services. It was an ugly hack anyway and if
people want to restart dbus, they need take care of that themselves.
(Closes: #540693, #530395)

Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/dbus.init

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=3653&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Sat Jul 17 12:14:12 2010
@@ -17,6 +17,9 @@
     - Remove old Conflicts which is no longer relevant.
   * debian/dbus.init
     - Simplify check in start_it_up() by using the existing status action.
+    - Stop restarting dependent services. It was an ugly hack anyway and if
+      people want to restart dbus, they need take care of that themselves.
+      (Closes: #540693, #530395)
 
  -- Michael Biebl <biebl at debian.org>  Thu, 15 Jul 2010 01:10:46 +0200
 

Modified: packages/unstable/dbus/debian/dbus.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.init?rev=3653&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.init (original)
+++ packages/unstable/dbus/debian/dbus.init Sat Jul 17 12:14:12 2010
@@ -42,49 +42,6 @@
   fi
 }
 
-dependent_services()
-{
-  # Do nothing if we are called by init
-  [ ! -z $runlevel ] && return 
-
-  # Determine current runlevel
-  r=$(/sbin/runlevel) || true
-  r=${r#*\ }
-
-  # Do nothing if we can't determine the runlevel (e.g. inside chroots)
-  [ "$r" = "unknown" ] && return
-
-  if [ "$1" = "stop" ] ; then
-    param="--reverse"
-    action="stop"
-  else
-    param=""
-    action="start"
-  fi
-
-  # Get the list of services active in this runlevel
-  if [ -d /etc/rc${r}.d/ ] ; then # sysv-rc
-    services=$(grep -s -l "^# Required-Start:.*dbus" /etc/rc${r}.d/S??* | sort $param)
-  elif [ -f /etc/runlevel.conf ] ; then # file-rc
-    list=$(grep -s -l "^# Required-Start:.*dbus" /etc/init.d/* || true)
-    services=$( for i in $list ; do
-      grep -E "^[[:digit:]]{2}[[:space:]]+([0-9,S]+|[-])[[:space:]]+.*$r.*[[:space:]]+$i$" /etc/runlevel.conf
-    done  | sort $param | awk '{print $4}' )
-  else
-    services=""
-    log_warning_msg "Unable to determine dependent services: unknown init system"
-  fi
-
-  # Start the services in the correct order
-  for i in $services ; do
-    service=$(basename $i)
-    service=${service#S??}
-    invoke-rc.d $service $action || true
-  done
-
-}
-
-
 start_it_up()
 {
   if [ ! -d $PIDDIR ]; then
@@ -114,12 +71,10 @@
   start-stop-daemon --start --quiet --pidfile $PIDFILE \
     --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
   log_end_msg $?
-  dependent_services start
 }
 
 shut_it_down()
 {
-  dependent_services stop
   log_daemon_msg "Stopping $DESC" "$NAME"
   start-stop-daemon --stop --retry 5 --quiet --oknodo --pidfile $PIDFILE \
     --user $DAEMONUSER