Imported Upstream version 0.8.3.999 upstream/0.8.3.999

3 files changed, 1 insertions, 111 deletions

diff --git a/initscript/RedHat/Makefile.am b/initscript/RedHat/Makefile.am
index 3f7b876b..fc97ec45 100644
--- a/initscript/RedHat/Makefile.am
+++ b/initscript/RedHat/Makefile.am
@@ -1,6 +1,3 @@
-EXTRA_DIST = NetworkManager
-DISTCLEANFILES = NetworkManager
-
 initddir = $(sysconfdir)/rc.d/init.d
 initd_SCRIPTS = NetworkManager
 
diff --git a/initscript/RedHat/Makefile.in b/initscript/RedHat/Makefile.in
index 9e3bc499..7ce3a5ce 100644
--- a/initscript/RedHat/Makefile.in
+++ b/initscript/RedHat/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 = NetworkManager
-DISTCLEANFILES = NetworkManager
 initddir = $(sysconfdir)/rc.d/init.d
 initd_SCRIPTS = 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/RedHat/NetworkManager b/initscript/RedHat/NetworkManager
deleted file mode 100644
index 465c7611..00000000
--- a/initscript/RedHat/NetworkManager
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-#
-# NetworkManager:   NetworkManager daemon
-#
-# chkconfig: - 23 84
-# description:  This is a daemon for automatically switching network \
-#               connections to the best available connection.
-#
-# processname: NetworkManager
-# pidfile: /var/run/NetworkManager/NetworkManager.pid
-#
-### BEGIN INIT INFO
-# Provides: network_manager $network
-# Required-Start: messagebus
-# Required-Stop: messagebus
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: start and stop NetworkManager
-# Description: NetworkManager is a tool for easily managing network connections
-### END INIT INFO
-
-prefix=/usr
-exec_prefix=/usr
-sbindir=${exec_prefix}/sbin
-
-NETWORKMANAGER_BIN=${sbindir}/NetworkManager
-
-# Sanity checks.
-[ -x $NETWORKMANAGER_BIN ] || exit 1
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source network configuration
-. /etc/sysconfig/network
-
-# so we can rearrange this easily
-processname=NetworkManager
-servicename=NetworkManager
-pidfile=/var/run/NetworkManager/NetworkManager.pid
-
-RETVAL=0
-
-start()
-{
-	echo -n $"Setting network parameters... "
-	sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
-	success
-	echo
-
-	echo -n $"Starting NetworkManager daemon: "
-	daemon --pidfile $pidfile --check $servicename $processname --pid-file=$pidfile
-	RETVAL=$?
-	echo
-	if [ -n "${NETWORKWAIT}" ]; then 
-		[ -z "${LINKDELAY}" ] && LINKDELAY=10
-		echo -n $"Waiting for network..."
-		nm-online -q --timeout=$LINKDELAY || nm-online -q -x --timeout=30
-		[ "$?" = "0" ] && success "network startup" || failure "network startup"
-		echo
-		[ -n "${NETWORKDELAY}" ] && /bin/sleep ${NETWORKDELAY}
-	fi
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
-}
-
-stop()
-{
-	echo -n $"Stopping NetworkManager daemon: "
-	killproc -p $pidfile $servicename
-	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