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

	Patch from Per Øyvind Karlsen <peroyvind@mandriva.org>

	* configure.in
	  initscript/Makefile.am
	  initscript/Mandriva/Makefile.am
	  initscript/Mandriva/networkmanager.in
	  initscript/Mandriva/networkmanagerdispatcher.in
	  src/backends/Makefile.am
	  src/backends/NetworkManagerMandriva.c
	  system-settings/plugins/Makefile.am
		- Add Mandriva support



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

4 files changed, 194 insertions, 0 deletions

diff --git a/initscript/Makefile.am b/initscript/Makefile.am
index be662e9d82..4cc710eba4 100644
--- a/initscript/Makefile.am
+++ b/initscript/Makefile.am
@@ -20,3 +20,6 @@ endif
 if TARGET_PALDO
 SUBDIRS += paldo
 endif
+if TARGET_MANDRIVA
+SUBDIRS += Mandriva
+endif
diff --git a/initscript/Mandriva/Makefile.am b/initscript/Mandriva/Makefile.am
new file mode 100644
index 0000000000..3c1533f483
--- /dev/null
+++ b/initscript/Mandriva/Makefile.am
@@ -0,0 +1,5 @@
+EXTRA_DIST = networkmanager networkmanagerdispatcher
+
+initddir = $(sysconfdir)/rc.d/init.d
+initd_SCRIPTS = networkmanager networkmanagerdispatcher
+
diff --git a/initscript/Mandriva/networkmanager.in b/initscript/Mandriva/networkmanager.in
new file mode 100644
index 0000000000..8f45b20487
--- /dev/null
+++ b/initscript/Mandriva/networkmanager.in
@@ -0,0 +1,98 @@
+#!/bin/sh
+#
+# NetworkManager:   NetworkManager daemon
+#
+# chkconfig: - 98 02
+# 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: networkmanager
+# Required-Start: $network
+# Required-Stop: $network
+# Default-Start: 3 4 5
+# Short-Description: Daemon for automatically switching to best network connection.
+# Description: This is a daemon for automatically switching network
+#              connections to the best available connection.
+### END INIT INFO
+
+prefix=@prefix@
+exec_prefix=@prefix@
+sbindir=@sbindir@
+
+NETWORKMANAGER_BIN=${sbindir}/NetworkManager
+
+# Sanity checks.
+[ -x $NETWORKMANAGER_BIN ] || exit 1
+
+# We need /sbin/ip
+[ -x /sbin/ip ] || exit 1
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# so we can rearrange this easily
+processname=NetworkManager
+servicename=NetworkManager
+pidfile=/var/run/NetworkManager/NetworkManager.pid
+
+RETVAL=0
+
+start()
+{
+	echo $"Setting network parameters... "
+	sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
+
+	if [ ! -e /var/lock/subsys/named ]; then
+		service named start >/dev/null 2>&1
+	fi
+
+	echo -n $"Starting NetworkManager daemon: "
+	daemon --check $servicename $processname --pid-file=$pidfile
+	RETVAL=$?
+	echo
+	[ $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
diff --git a/initscript/Mandriva/networkmanagerdispatcher.in b/initscript/Mandriva/networkmanagerdispatcher.in
new file mode 100644
index 0000000000..b4bc5f53da
--- /dev/null
+++ b/initscript/Mandriva/networkmanagerdispatcher.in
@@ -0,0 +1,88 @@
+#!/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