Imported Upstream version 0.8.3.999 upstream/0.8.3.999

3 files changed, 1 insertions, 99 deletions

diff --git a/initscript/Slackware/Makefile.am b/initscript/Slackware/Makefile.am
index ded3ee09..254bb7ad 100644
--- a/initscript/Slackware/Makefile.am
+++ b/initscript/Slackware/Makefile.am
@@ -1,6 +1,3 @@
-EXTRA_DIST = rc.networkmanager
-DISTCLEANFILES = rc.networkmanager
-
 initddir = $(sysconfdir)/rc.d
 initd_SCRIPTS = rc.networkmanager
 
diff --git a/initscript/Slackware/Makefile.in b/initscript/Slackware/Makefile.in
index 58f85f47..b0d96d25 100644
--- a/initscript/Slackware/Makefile.in
+++ b/initscript/Slackware/Makefile.in
@@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -268,8 +268,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = rc.networkmanager
-DISTCLEANFILES = rc.networkmanager
 initddir = $(sysconfdir)/rc.d
 initd_SCRIPTS = rc.networkmanager
 all: all-am
@@ -412,7 +410,6 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/initscript/Slackware/rc.networkmanager b/initscript/Slackware/rc.networkmanager
deleted file mode 100644
index 5ab01ea1..00000000
--- a/initscript/Slackware/rc.networkmanager
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# NetworkManager:   NetworkManager daemon
-#
-# description:  This is a daemon for automatically switching network \
-#               connections to the best available connection. \
-#
-# processname: NetworkManager
-# pidfile: /var/run/NetworkManager.pid
-#
-
-prefix=/usr
-exec_prefix=/usr
-sbindir=${exec_prefix}/sbin
-
-NETWORKMANAGER_BIN=${sbindir}/NetworkManager
-
-# Sanity checks.
-[ -x $NETWORKMANAGER_BIN ] || exit 0
-
-PIDFILE=/var/run/NetworkManager.pid
-
-nm_start()
-{
-	if [ "`pgrep dbus-daemon`" = "" ]; then
-    echo "D-BUS must be running to start NetworkManager"
-    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 NetworkManager 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" != 'NetworkManager' ]; then
-    return 1
-  fi
-}
-
-nm_stop()
-{
-  echo -en "Stopping NetworkManager: "
-  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
-  sleep 2
-  nm_start
-}
-
-case "$1" in
-'start')
-  if ( ! nm_status ); then
-    nm_start
-  else
-    echo "NetworkManager is already running (will not start it twice)."
-  fi
-		;;
-'stop')
-  nm_stop
-		;;
-'restart')
-  nm_restart
-		;;
-'status')
-  if ( nm_status ); then
-    echo "NetworkManager is currently running"
-  else
-    echo "NetworkManager is not running."
-  fi
-		;;
-*)
-  echo "usage $0 start|stop|status|restart"
-esac