diff options
author | Michael Biebl <biebl@debian.org> | 2010-07-17 12:14:12 +0000 |
---|---|---|
committer | Michael Biebl <biebl@debian.org> | 2010-07-17 12:14:12 +0000 |
commit | c3c16887f7b92198448e86fe3c1cff4385fd1f01 (patch) | |
tree | 195d7f4e0c15e0c647d17a91c5f0b548fe104053 /debian/dbus.init | |
parent | ceeff121805dcf435c6eafcb4bef16477fac5b6f (diff) | |
download | dbus-c3c16887f7b92198448e86fe3c1cff4385fd1f01.tar.gz |
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)
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@3653 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian/dbus.init')
-rw-r--r-- | debian/dbus.init | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/debian/dbus.init b/debian/dbus.init index e8abdf50..9f9453a8 100644 --- a/debian/dbus.init +++ b/debian/dbus.init @@ -42,49 +42,6 @@ create_machineid() { 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_it_up() 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 |