1 diff -urN NetworkManager-0.7.2/configure.ac NetworkManager-0.7.2.new/configure.ac
2 --- NetworkManager-0.7.2/configure.ac 2009-11-23 20:24:09.000000000 +0100
3 +++ NetworkManager-0.7.2.new/configure.ac 2009-11-26 22:05:02.396072295 +0100
8 -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 or mandriva]))
9 +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 pld]))
10 if test "z$with_distro" = "z"; then
11 AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
12 AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
14 AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
15 AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware")
16 AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva")
17 + AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
18 if test "z$with_distro" = "z"; then
19 with_distro=`lsb_release -is`
25 - redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva) ;;
26 + redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pld) ;;
28 echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)"
31 AC_DEFINE(TARGET_MANDRIVA, 1, [Define if you have Mandriva])
34 +AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
35 +if test x"$with_distro" = xpld; then
36 + AC_DEFINE(TARGET_PLD, 1, [Define if you have PLD])
39 AC_MSG_CHECKING([Linux Wireless Extensions >= 18])
40 AC_TRY_COMPILE([#ifndef __user
43 initscript/paldo/NetworkManager
44 initscript/Mandriva/Makefile
45 initscript/Mandriva/networkmanager
46 +initscript/PLD/Makefile
47 +initscript/PLD/NetworkManager
48 introspection/Makefile
51 diff -urN NetworkManager-0.7.2/initscript/Makefile.am NetworkManager-0.7.2.new/initscript/Makefile.am
52 --- NetworkManager-0.7.2/initscript/Makefile.am 2009-08-28 17:53:17.000000000 +0200
53 +++ NetworkManager-0.7.2.new/initscript/Makefile.am 2009-11-26 22:05:31.383612264 +0100
61 diff -urN NetworkManager-0.7.2/initscript/PLD/Makefile.am NetworkManager-0.7.2.new/initscript/PLD/Makefile.am
62 --- NetworkManager-0.7.2/initscript/PLD/Makefile.am 1970-01-01 01:00:00.000000000 +0100
63 +++ NetworkManager-0.7.2.new/initscript/PLD/Makefile.am 2009-11-26 22:06:44.072745786 +0100
65 +EXTRA_DIST = NetworkManager
66 +DISTCLEANFILES = NetworkManager
68 +initddir = $(sysconfdir)/rc.d/init.d
69 +initd_SCRIPTS = NetworkManager
70 diff -urN NetworkManager-0.7.2/initscript/PLD/NetworkManager.in NetworkManager-0.7.2.new/initscript/PLD/NetworkManager.in
71 --- NetworkManager-0.7.2/initscript/PLD/NetworkManager.in 1970-01-01 01:00:00.000000000 +0100
72 +++ NetworkManager-0.7.2.new/initscript/PLD/NetworkManager.in 2009-11-26 22:07:27.482742169 +0100
76 +# NetworkManager NetworkManager daemon
78 +# chkconfig: 345 99 01
80 +# description: This is a daemon for automatically switching network \
81 +# connections to the best available connection.
83 +# processname: NetworkManager
84 +# pidfile: /var/run/NetworkManager.pid
87 +# Source function library.
88 +. /etc/rc.d/init.d/functions
90 +# Source networking configuration.
91 +. /etc/sysconfig/network
93 +# Check that networking is up.
94 +if is_yes "${NETWORKING}"; then
95 + if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
96 + msg_network_down NetworkManager
104 + # Check if the service is already running?
105 + if [ ! -f /var/lock/subsys/NetworkManager ]; then
106 + msg_starting NetworkManager
107 + daemon NetworkManager --pid-file=/var/run/NetworkManager.pid
109 + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/NetworkManager
111 + msg_already_running NetworkManager
115 + if [ -f /var/lock/subsys/NetworkManager ]; then
117 + msg_stopping NetworkManager
118 + killproc NetworkManager
119 + rm -f /var/lock/subsys/NetworkManager
121 + msg_not_running NetworkManager
139 + status NetworkManager
143 + msg_usage "$0 {start|stop|restart|status}"
148 diff -urN NetworkManager-0.7.2/src/backends/Makefile.am NetworkManager-0.7.2.new/src/backends/Makefile.am
149 --- NetworkManager-0.7.2/src/backends/Makefile.am 2009-11-23 20:17:47.000000000 +0100
150 +++ NetworkManager-0.7.2.new/src/backends/Makefile.am 2009-11-26 22:08:06.086054252 +0100
152 libnmbackend_la_SOURCES += NetworkManagerMandriva.c
156 +libnmbackend_la_SOURCES += NetworkManagerPLD.c
159 libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GLIB_LIBS)
160 libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \
162 diff -urN NetworkManager-0.7.2/src/backends/NetworkManagerPLD.c NetworkManager-0.7.2.new/src/backends/NetworkManagerPLD.c
163 --- NetworkManager-0.7.2/src/backends/NetworkManagerPLD.c 1970-01-01 01:00:00.000000000 +0100
164 +++ NetworkManager-0.7.2.new/src/backends/NetworkManagerPLD.c 2009-11-26 22:10:12.232724504 +0100
166 +/* NetworkManager -- Network link manager
168 + * Patryk Zawadzki <patrys@pld-linux.org>
170 + * This program is free software; you can redistribute it and/or modify
171 + * it under the terms of the GNU General Public License as published by
172 + * the Free Software Foundation; either version 2 of the License, or
173 + * (at your option) any later version.
175 + * This program is distributed in the hope that it will be useful,
176 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
177 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
178 + * GNU General Public License for more details.
180 + * You should have received a copy of the GNU General Public License
181 + * along with this program; if not, write to the Free Software
182 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
184 + * (C) Copyright 2004 RedHat, Inc.
185 + * (C) Copyright 2004 Narayan Newton
186 + * (C) Copyright 2005 wrobell <wrobell@pld-linux.org>
187 + * (C) Copyright 2007 Marcin Banasiak <megabajt@pld-linux.org>
188 + * (C) Copyright 2005-2008 Patryk Zawadzki <patrys@pld-linux.org>
191 +#ifdef HAVE_CONFIG_H
199 +#include "NetworkManagerGeneric.h"
200 +#include "NetworkManagerSystem.h"
201 +#include "NetworkManagerUtils.h"
204 + * nm_system_enable_loopback
206 + * Bring up the loopback interface
209 +void nm_system_enable_loopback (void)
211 + nm_generic_enable_loopback ();
215 + * nm_system_update_dns
217 + * Invalidate the nscd host cache, if it exists, since
218 + * we changed resolv.conf.
221 +void nm_system_update_dns (void)
223 + if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE | G_FILE_TEST_IS_REGULAR)) {
224 + nm_spawn_process ("/etc/rc.d/init.d/nscd restart");