2008-04-27 Dan Williams <dcbw@redhat.com>

	* Makefile.am
	  configure.in
	  dispatcher-daemon/Makefile.am
	  dispatcher-daemon/NetworkManagerDispatcher.c
	  initscript/Arch/Makefile.am
	  initscript/Arch/networkmanager-dispatcher.in
	  initscript/Gentoo/Makefile.am
	  initscript/Gentoo/NetworkManagerDispatcher.in
	  initscript/Mandriva/Makefile.am
	  initscript/Mandriva/networkmanagerdispatcher.in
	  initscript/RedHat/Makefile.am
	  initscript/RedHat/NetworkManagerDispatcher.in
	  initscript/SUSE/Makefile.am
	  initscript/SUSE/networkmanager-dispatcher.in
	  initscript/Slackware/Makefile.am
	  initscript/Slackware/rc.networkmanager-dispatcher.in
	  initscript/paldo/Makefile.am
	  initscript/paldo/NetworkManagerDispatcher.in
	  man/Makefile.am
	  man/NetworkManagerDispatcher.8.in
		- Remove the dispatcher daemon



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3608 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

2 files changed, 3 insertions, 101 deletions

diff --git a/initscript/Slackware/Makefile.am b/initscript/Slackware/Makefile.am
index 70c508ff5b..ded3ee0997 100644
--- a/initscript/Slackware/Makefile.am
+++ b/initscript/Slackware/Makefile.am
@@ -1,5 +1,6 @@
-EXTRA_DIST = rc.networkmanager rc.networkmanager-dispatcher
+EXTRA_DIST = rc.networkmanager
+DISTCLEANFILES = rc.networkmanager
 
 initddir = $(sysconfdir)/rc.d
-initd_SCRIPTS = rc.networkmanager rc.networkmanager-dispatcher
+initd_SCRIPTS = rc.networkmanager
 
diff --git a/initscript/Slackware/rc.networkmanager-dispatcher.in b/initscript/Slackware/rc.networkmanager-dispatcher.in
deleted file mode 100644
index 72e5b4ab6e..0000000000
--- a/initscript/Slackware/rc.networkmanager-dispatcher.in
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-#
-# NetworkManagerDispatcher:   NetworkManagerDispatcher daemon
-#
-# description:  This is a daemon for automatically switching network \
-#               connections to the best available connection. \
-#
-# processname: NetworkManagerDispatcher
-# pidfile: /var/run/NetworkManagerDispatcher.pid
-#
-
-prefix=@prefix@
-exec_prefix=@prefix@
-sbindir=@sbindir@
-
-NETWORKMANAGER_BIN=${sbindir}/NetworkManagerDispatcher
-
-# Sanity checks.
-[ -x $NETWORKMANAGER_BIN ] || exit 0
-
-# We need /sbin/ip
-[ -x /sbin/ip ] || exit 0
-
-PIDFILE=/var/run/NetworkManagerDispatcher.pid
-
-nm_start()
-{
-	if [ "`pgrep dbus-daemon`" = "" ]; then
-    echo "D-BUS must be running to start NetworkManagerDispatcher"
-    return
-	fi
-  
-	if [ "`pgrep hald`" = "" ]; then
-	 echo "HAL must be running to start NetworkManagerDispatcher"
-	 return
-	fi
- 
-  # Just in case the pidfile is still there, we may need to nuke it.
-  if [ -e "$PIDFILE" ]; then
-    rm -f $PIDFILE
-  fi
-
-  echo "Starting NetworkManagerDispatcher daemon:  $NETWORKMANAGER_BIN"
-  $NETWORKMANAGER_BIN
-}
-
-nm_status()
-{
-  local pidlist=`cat $PIDFILE 2>/dev/null`
-  if [ -z "$pidlist" ]; then
-    return 1
-  fi
-  local command=`ps -p $pidlist -o comm=`
-  if [ "$command" != 'NetworkManagerDispatcher' ]; then
-    return 1
-  fi
-}
-
-nm_stop()
-{
-  echo -en "Stopping NetworkManagerDispatcher: "
-  local pidlist=`cat $PIDFILE 2>/dev/null`
-  if [ ! -z "$pidlist" ]; then
-    kill $pidlist &>/dev/null
-    rm -f $PIDFILE &>/dev/null
-	fi
-  echo "stopped";
-}
-
-nm_restart()
-{
-  nm_stop
-  nm_start
-}
-
-case "$1" in
-'start')
-  if ( ! nm_status ); then
-    nm_start
-  else
-    echo "NetworkManagerDispatcher is already running (will not start it twice)."
-  fi
-		;;
-'stop')
-  nm_stop
-		;;
-'restart')
-  nm_restart
-		;;
-'status')
-  if ( nm_status ); then
-    echo "NetworkManagerDispatcher is currently running"
-  else
-    echo "NetworkManagerDispatcher is not running."
-  fi
-		;;
-*)
-  echo "usage $0 start|stop|status|restart"
-esac