diff -urN NetworkManager-0.7.2/configure.ac NetworkManager-0.7.2.new/configure.ac --- NetworkManager-0.7.2/configure.ac 2009-11-23 20:24:09.000000000 +0100 +++ NetworkManager-0.7.2.new/configure.ac 2009-11-26 22:05:02.396072295 +0100 @@ -83,7 +83,7 @@ dnl AC_C_BIGENDIAN -AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva or pardus])) +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus or pld])) if test "z$with_distro" = "z"; then AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") @@ -105,7 +106,7 @@ exit 1 else case $with_distro in - redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus) ;; + redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|pld) ;; *) echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" exit 1 @@ -164,6 +165,11 @@ AC_DEFINE(TARGET_PARDUS, 1, [Define if you have Pardus]) fi +AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld) +if test x"$with_distro" = xpld; then + AC_DEFINE(TARGET_PLD, 1, [Define if you have PLD]) +fi + AC_MSG_CHECKING([Linux Wireless Extensions >= 18]) AC_TRY_COMPILE([#ifndef __user #define __user @@ -164,6 +165,11 @@ AC_DEFINE(TARGET_PARDUS, 1, [Define if you have Pardus]) fi +AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld) +if test x"$with_distro" = xpld; then + AC_DEFINE(TARGET_PLD, 1, [Define if you have PLD]) +fi + AC_MSG_CHECKING([Linux Wireless Extensions >= 18]) AC_TRY_COMPILE([#ifndef __user #define __user @@ -513,6 +519,8 @@ initscript/paldo/NetworkManager initscript/Mandriva/Makefile initscript/Mandriva/networkmanager +initscript/PLD/Makefile +initscript/PLD/NetworkManager introspection/Makefile man/Makefile man/NetworkManager.8 diff -urN NetworkManager-0.7.2/initscript/Makefile.am NetworkManager-0.7.2.new/initscript/Makefile.am --- NetworkManager-0.7.2/initscript/Makefile.am 2009-08-28 17:53:17.000000000 +0200 +++ NetworkManager-0.7.2.new/initscript/Makefile.am 2009-11-26 22:05:31.383612264 +0100 @@ -23,3 +23,6 @@ if TARGET_MANDRIVA SUBDIRS += Mandriva endif +if TARGET_PLD +SUBDIRS += PLD +endif diff -urN NetworkManager-0.7.2/initscript/PLD/Makefile.am NetworkManager-0.7.2.new/initscript/PLD/Makefile.am --- NetworkManager-0.7.2/initscript/PLD/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ NetworkManager-0.7.2.new/initscript/PLD/Makefile.am 2009-11-26 22:06:44.072745786 +0100 @@ -0,0 +1,5 @@ +EXTRA_DIST = NetworkManager +DISTCLEANFILES = NetworkManager + +initddir = $(sysconfdir)/rc.d/init.d +initd_SCRIPTS = NetworkManager diff -urN NetworkManager-0.7.2/initscript/PLD/NetworkManager.in NetworkManager-0.7.2.new/initscript/PLD/NetworkManager.in --- NetworkManager-0.7.2/initscript/PLD/NetworkManager.in 1970-01-01 01:00:00.000000000 +0100 +++ NetworkManager-0.7.2.new/initscript/PLD/NetworkManager.in 2009-11-26 22:07:27.482742169 +0100 @@ -0,0 +1,74 @@ +#!/bin/sh +# +# NetworkManager NetworkManager daemon +# +# chkconfig: 345 99 01 +# +# description: This is a daemon for automatically switching network \ +# connections to the best available connection. +# +# processname: NetworkManager +# pidfile: /var/run/NetworkManager.pid +# + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +# Check that networking is up. +if is_yes "${NETWORKING}"; then + if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then + msg_network_down NetworkManager + exit 1 + fi +else + exit 0 +fi + +start() { + # Check if the service is already running? + if [ ! -f /var/lock/subsys/NetworkManager ]; then + msg_starting NetworkManager + daemon NetworkManager --pid-file=/var/run/NetworkManager.pid + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/NetworkManager + else + msg_already_running NetworkManager + fi +} +stop() { + if [ -f /var/lock/subsys/NetworkManager ]; then + # Stop daemons. + msg_stopping NetworkManager + killproc NetworkManager + rm -f /var/lock/subsys/NetworkManager + else + msg_not_running NetworkManager + fi +} + +RETVAL=0 + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + status) + status NetworkManager + RETVAL=$? + ;; + *) + msg_usage "$0 {start|stop|restart|status}" + exit 3 +esac + +exit $RETVAL diff -urN NetworkManager-0.7.2/src/backends/Makefile.am NetworkManager-0.7.2.new/src/backends/Makefile.am --- NetworkManager-0.7.2/src/backends/Makefile.am 2009-11-23 20:17:47.000000000 +0100 +++ NetworkManager-0.7.2.new/src/backends/Makefile.am 2009-11-26 22:08:06.086054252 +0100 @@ -49,6 +49,10 @@ libnmbackend_la_SOURCES += NetworkManagerMandriva.c endif +if TARGET_PLD +libnmbackend_la_SOURCES += NetworkManagerPLD.c +endif + libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GLIB_LIBS) libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ diff -urN NetworkManager-0.7.2/src/backends/NetworkManagerPLD.c NetworkManager-0.7.2.new/src/backends/NetworkManagerPLD.c --- NetworkManager-0.7.2/src/backends/NetworkManagerPLD.c 1970-01-01 01:00:00.000000000 +0100 +++ NetworkManager-0.7.2.new/src/backends/NetworkManagerPLD.c 2009-11-26 22:10:12.232724504 +0100 @@ -0,0 +1,62 @@ +/* NetworkManager -- Network link manager + * + * Patryk Zawadzki + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * (C) Copyright 2004 RedHat, Inc. + * (C) Copyright 2004 Narayan Newton + * (C) Copyright 2005 wrobell + * (C) Copyright 2007 Marcin Banasiak + * (C) Copyright 2005-2008 Patryk Zawadzki + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "NetworkManagerGeneric.h" +#include "NetworkManagerSystem.h" +#include "NetworkManagerUtils.h" + +/* + * nm_system_enable_loopback + * + * Bring up the loopback interface + * + */ +void nm_system_enable_loopback (void) +{ + nm_generic_enable_loopback (); +} + +/* + * nm_system_update_dns + * + * Invalidate the nscd host cache, if it exists, since + * we changed resolv.conf. + * + */ +void nm_system_update_dns (void) +{ + if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE | G_FILE_TEST_IS_REGULAR)) { + nm_spawn_process ("/etc/rc.d/init.d/nscd restart"); + } +} +