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

14 files changed, 21 insertions, 478 deletions

diff --git a/initscript/Arch/Makefile.am b/initscript/Arch/Makefile.am
index b611ead6..2c1f8b54 100644
--- a/initscript/Arch/Makefile.am
+++ b/initscript/Arch/Makefile.am
@@ -1,4 +1,5 @@
-EXTRA_DIST = networkmanager networkmanager-dispatcher 
+EXTRA_DIST = networkmanager
+DISTCLEANFILES = networkmanager
 
 initddir = $(sysconfdir)/rc.d
-initd_SCRIPTS = networkmanager networkmanager-dispatcher
+initd_SCRIPTS = networkmanager
diff --git a/initscript/Arch/networkmanager-dispatcher.in b/initscript/Arch/networkmanager-dispatcher.in
deleted file mode 100644
index cfb0fafc..00000000
--- a/initscript/Arch/networkmanager-dispatcher.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-prefix=@prefix@
-exec_prefix=@prefix@
-sbindir=@sbindir@
-NETWORKMANAGER_BIN=${sbindir}/NetworkManagerDispatcher
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# Sanity checks.
-[ -x $NETWORKMANAGER_BIN ] || exit 0
-
-# We need /usr/sbin/ip
-[ -x /usr/sbin/ip ] || exit 0
-
-PID=`pidof -o %PPID $NETWORKMANAGER_BIN`
-case "$1" in
-	start)
-		stat_busy "Starting NetworkManagerDispatcher"
-		if [ -z "$PID" ]; then
-			$NETWORKMANAGER_BIN
-		fi
-		if [ ! -z "$PID" -o $? -gt 0 ]; then
-			stat_fail
-		else
-			add_daemon networkmanager-dispatcher
-			stat_done
-		fi
-		;;
-	stop)
-		stat_busy "Stopping NetworkManagerDispatcher"
-			[ ! -z "$PID" ] && kill $PID &> /dev/null
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm_daemon networkmanager-dispatcher
-			stat_done
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-		;;
-esac
-exit 0
-
-
-
diff --git a/initscript/Gentoo/Makefile.am b/initscript/Gentoo/Makefile.am
index 93a0f3da..af023b75 100644
--- a/initscript/Gentoo/Makefile.am
+++ b/initscript/Gentoo/Makefile.am
@@ -1,4 +1,5 @@
-EXTRA_DIST = NetworkManager NetworkManagerDispatcher
+EXTRA_DIST = NetworkManager
+DISTCLEANFILES = NetworkManager
 
 initddir = $(sysconfdir)/init.d
-initd_SCRIPTS = NetworkManager NetworkManagerDispatcher
+initd_SCRIPTS = NetworkManager
diff --git a/initscript/Gentoo/NetworkManagerDispatcher.in b/initscript/Gentoo/NetworkManagerDispatcher.in
deleted file mode 100755
index 8165275d..00000000
--- a/initscript/Gentoo/NetworkManagerDispatcher.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
-# Distributed under the terms of the GNU General Purpose License v2
-# $Header: $
-
-depend() {
-   need NetworkManager
-}
-
-start() {
-   ebegin "Starting NetworkManagerDispatcher"
-      start-stop-daemon --start --quiet --pidfile /var/run/NetworkManagerDispatcher.pid --exec /usr/sbin/NetworkManagerDispatcher
-      eend $?
-}
-
-stop() {
-   local retval
-
-   ebegin "Stopping NetworkManagerDispatcher"
-   start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManagerDispatcher.pid
-   retval=$?
-   eend ${retval}
-
-   [ -e /var/run/NetworkManagerDispatcher.pid ] && rm -f /var/run/NetworkManagerDispatcher.pid
-}
-
-# vim: set ft=gentoo-init-d ts=3 sw=3 et:
diff --git a/initscript/Mandriva/Makefile.am b/initscript/Mandriva/Makefile.am
index 3c1533f4..0a0cc2bb 100644
--- a/initscript/Mandriva/Makefile.am
+++ b/initscript/Mandriva/Makefile.am
@@ -1,5 +1,6 @@
-EXTRA_DIST = networkmanager networkmanagerdispatcher
+EXTRA_DIST = networkmanager
+DISTCLEANFILES = networkmanager
 
 initddir = $(sysconfdir)/rc.d/init.d
-initd_SCRIPTS = networkmanager networkmanagerdispatcher
+initd_SCRIPTS = networkmanager
 
diff --git a/initscript/Mandriva/networkmanagerdispatcher.in b/initscript/Mandriva/networkmanagerdispatcher.in
deleted file mode 100644
index b4bc5f53..00000000
--- a/initscript/Mandriva/networkmanagerdispatcher.in
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-#
-# NetworkManager:   NetworkManagerDispatcher daemon
-#
-# chkconfig: - 98 02
-# description: This daemon automatically runs scripts when NetworkManager \
-#              changes the network state.
-#
-# processname: NetworkManagerDispatcher
-# pidfile: /var/run/NetworkManager/NetworkManagerDispatcher.pid
-#
-### BEGIN INIT INFO
-# Provides: networkmanagerdispatcher
-# Required-Start: networkmanager
-# Required-Stop: networkmanager
-# Default-Start: 3 4 5
-# Short-Description: Daemon for automatically running scripts at change of network state
-# Description: This daemon automatically runs scripts when NetworkManager
-#              changes the network state.
-### END INIT INFO
-
-prefix=@prefix@
-exec_prefix=@prefix@
-sbindir=@sbindir@
-
-NETWORKMANAGERDISPATCHER_BIN=${sbindir}/NetworkManagerDispatcher
-
-# Sanity checks.
-[ -x $NETWORKMANAGERDISPATCHER_BIN ] || exit 1
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# so we can rearrange this easily
-processname=NetworkManagerDispatcher
-servicename=NetworkManagerDispatcher
-pidfile=/var/run/NetworkManager/NetworkManagerDispatcher.pid
-
-RETVAL=0
-
-start()
-{
-	echo -n $"Starting NetworkManagerDispatcher daemon: "
-	daemon --check $servicename $processname --pid-file=$pidfile
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
-}
-
-stop()
-{
-	echo -n $"Stopping NetworkManagerDispatcher daemon: "
-	killproc $servicename -TERM
-	RETVAL=$?
-	echo
-	if [ $RETVAL -eq 0 ]; then
-		rm -f /var/lock/subsys/$servicename
-		rm -f $pidfile
-	fi
-}
-
-# See how we were called.
-case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	status)
-		status -p $pidfile $processname
-		RETVAL=$?
-		;;
-	restart)
-		stop
-		start
-		;;
-	condrestart)
-		if [ -f /var/lock/subsys/$servicename ]; then
-			stop
-			start
-		fi
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|status|restart|condrestart}"
-		;;
-esac
-exit $RETVAL
diff --git a/initscript/RedHat/Makefile.am b/initscript/RedHat/Makefile.am
index 8796239a..3f7b876b 100644
--- a/initscript/RedHat/Makefile.am
+++ b/initscript/RedHat/Makefile.am
@@ -1,5 +1,6 @@
-EXTRA_DIST = NetworkManager NetworkManagerDispatcher
+EXTRA_DIST = NetworkManager
+DISTCLEANFILES = NetworkManager
 
 initddir = $(sysconfdir)/rc.d/init.d
-initd_SCRIPTS = NetworkManager NetworkManagerDispatcher
+initd_SCRIPTS = NetworkManager
 
diff --git a/initscript/RedHat/NetworkManagerDispatcher.in b/initscript/RedHat/NetworkManagerDispatcher.in
deleted file mode 100755
index 8f35c779..00000000
--- a/initscript/RedHat/NetworkManagerDispatcher.in
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-#
-# NetworkManager:   NetworkManagerDispatcher daemon
-#
-# chkconfig: - 28 72
-# description: This daemon automatically runs scripts when NetworkManager \
-#              changes the network state.
-#
-# processname: NetworkManagerDispatcher
-# pidfile: /var/run/NetworkManager/NetworkManagerDispatcher.pid
-#
-### BEGIN INIT INFO
-# Provides: network_manager_dispatcher
-# Required-Start: network_manager messagebus
-# Required-Stop: network_manager messagebus
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: start and stop NetworkManagerDispatcher
-# Description: NetworkManagerDispatcher is a tool for running scripts triggered \
-#              by network events
-### END INIT INFO
-
-prefix=@prefix@
-exec_prefix=@prefix@
-sbindir=@sbindir@
-
-NETWORKMANAGERDISPATCHER_BIN=${sbindir}/NetworkManagerDispatcher
-
-# Sanity checks.
-[ -x $NETWORKMANAGERDISPATCHER_BIN ] || exit 1
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# so we can rearrange this easily
-processname=NetworkManagerDispatcher
-servicename=NetworkManagerDispatcher
-pidfile=/var/run/NetworkManager/NetworkManagerDispatcher.pid
-
-RETVAL=0
-
-start()
-{
-	echo -n $"Starting NetworkManagerDispatcher daemon: "
-	daemon --check $servicename $processname --pid-file=$pidfile
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
-}
-
-stop()
-{
-	echo -n $"Stopping NetworkManagerDispatcher daemon: "
-	killproc $servicename -TERM
-	RETVAL=$?
-	echo
-	if [ $RETVAL -eq 0 ]; then
-		rm -f /var/lock/subsys/$servicename
-		rm -f $pidfile
-	fi
-}
-
-# See how we were called.
-case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	status)
-		status -p $pidfile $processname
-		RETVAL=$?
-		;;
-	restart)
-		stop
-		start
-		;;
-	condrestart)
-		if [ -f /var/lock/subsys/$servicename ]; then
-			stop
-			start
-		fi
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|status|restart|condrestart}"
-		;;
-esac
-exit $RETVAL
diff --git a/initscript/SUSE/Makefile.am b/initscript/SUSE/Makefile.am
index 59c1370d..75a7c2ac 100644
--- a/initscript/SUSE/Makefile.am
+++ b/initscript/SUSE/Makefile.am
@@ -1,8 +1,8 @@
-EXTRA_DIST = networkmanager.in networkmanager-dispatcher.in
-DISTCLEANFILES = networkmanager networkmanager-dispatcher
+EXTRA_DIST = networkmanager.in
+DISTCLEANFILES = networkmanager
 
 # Nowadays, NetworkManager support is built-in to the SUSE networking
 # subsystem, therefore a SUSE machine does not want these scripts.  Uncomment
 # this if you actually want external initscripts, such as SUSE 10.0 or earlier.
 #initddir = $(sysconfdir)/init.d
-#initd_SCRIPTS = networkmanager networkmanager-dispatcher
+#initd_SCRIPTS = networkmanager
diff --git a/initscript/SUSE/networkmanager-dispatcher.in b/initscript/SUSE/networkmanager-dispatcher.in
deleted file mode 100644
index 5eda576e..00000000
--- a/initscript/SUSE/networkmanager-dispatcher.in
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /bin/sh
-
-### BEGIN INIT INFO
-# Provides:       networkmanager-dispatcher
-# Required-Start: dbus haldaemon networkmanager
-# Default-Start:  3 5
-# Default-Stop:
-# Description: NetworkManagerDispatcher responds to network events
-### END INIT INFO
-
-sbindir=@sbindir@
-
-NETWORKMANAGER_BIN=${sbindir}/NetworkManagerDispatcher
-test -x $NETWORKMANAGER_BIN || exit 5
-
-. /etc/rc.status
-rc_reset
-
-case "$1" in
-	start)
-		checkproc $NETWORKMANAGER_BIN
-		if [ $? = 0 ]; then
-			echo -n "NetworkManagerDispatcher already running"
-			rc_status -v
-			rc_exit
-		fi
-		echo -n "Starting the NetworkManagerDispatcher"
-		startproc $NETWORKMANAGER_BIN
-		rc_status -v
-		;;
-	stop)
-		echo -n "Shutting down the NetworkManagerDispatcher"
-		killproc -TERM $NETWORKMANAGER_BIN
-		rc_status -v
-		;;
-	restart)
-		$0 stop
-		$0 start
-		rc_status
-		;;
-	status)
-		echo -n "Checking for the NetworkManagerDispatcher: "
-		checkproc $NETWORKMANAGER_BIN
-		rc_status -v
-		;;
-	*)
-		echo "Usage: $0 {start|stop|status|restart}"
-		exit 1
-		;;
-esac
diff --git a/initscript/Slackware/Makefile.am b/initscript/Slackware/Makefile.am
index 70c508ff..ded3ee09 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 72e5b4ab..00000000
--- 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
diff --git a/initscript/paldo/Makefile.am b/initscript/paldo/Makefile.am
index 2f965bb3..3d67ff6e 100644
--- a/initscript/paldo/Makefile.am
+++ b/initscript/paldo/Makefile.am
@@ -1,5 +1,6 @@
-EXTRA_DIST = NetworkManager NetworkManagerDispatcher
+EXTRA_DIST = NetworkManager
+DISTCLEANFILES = NetworkManager
 
 initddir = $(sysconfdir)/init.d
-initd_SCRIPTS = NetworkManager NetworkManagerDispatcher
+initd_SCRIPTS = NetworkManager
 
diff --git a/initscript/paldo/NetworkManagerDispatcher.in b/initscript/paldo/NetworkManagerDispatcher.in
deleted file mode 100644
index 01fdb3eb..00000000
--- a/initscript/paldo/NetworkManagerDispatcher.in
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-### BEGIN INIT INFO
-# Provides: NetworkManagerDispatcher
-# Required-Start: $network dbus
-# Required-Stop: $network dbus
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 2 6
-### END INIT INFO
-. /lib/lsb/init-functions
-
-[ -e /etc/default/NetworkManager ] && source /etc/default/NetworkManager
-[ $(/usr/bin/tty -s; echo $?) -gt 0 -o  "$(/usr/bin/tty)" == "/dev/console" ] && [ "$START_NETWORK_MANAGER" != "TRUE" ] && exit 0
-
-prefix=@prefix@
-exec_prefix=@prefix@
-sbindir=@sbindir@
-
-case "$1" in
-	start)
-		echo -n "Starting NetworkManagerDispatcher..."
-		if start_daemon $sbindir/NetworkManagerDispatcher
-		then
-			log_success_msg
-		else
-			log_failure_msg
-		fi
-		;;
-	stop)
-		echo -n "Stopping NetworkManagerDispatcher..."
-		if killproc $sbindir/NetworkManagerDispatcher
-		then
-			log_success_msg "."
-		else
-			log_failure_msg
-		fi
-		;;
-	restart|force-reload)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	try-restart)
-		if pidofproc $sbindir/NetworkManagerDispatcher
-		then
-			$0 restart
-		fi
-		;;
-	status)
-		pidofproc $sbindir/NetworkManagerDispatcher
-		exit $?
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|try-restart|force-reload|status}"
-		exit 1
-		;;
-esac