Contents of /trunk/networkmanager/patches/networkmanager-0.9.0-magellan.patch
Parent Directory | Revision Log
Revision 1501 -
(show annotations)
(download)
Fri Aug 26 18:56:26 2011 UTC (13 years, 1 month ago) by niro
File size: 12402 byte(s)
Fri Aug 26 18:56:26 2011 UTC (13 years, 1 month ago) by niro
File size: 12402 byte(s)
-rediffed without sysvinit script installation
1 | diff -Naur NetworkManager-0.9.0/config.h.in NetworkManager-0.9.0-magellan/config.h.in |
2 | --- NetworkManager-0.9.0/config.h.in 2011-08-23 03:33:48.000000000 +0200 |
3 | +++ NetworkManager-0.9.0-magellan/config.h.in 2011-08-26 22:20:51.000000000 +0200 |
4 | @@ -165,6 +165,9 @@ |
5 | /* Define if you have linexa */ |
6 | #undef TARGET_LINEXA |
7 | |
8 | +/* Define if you have Magellan */ |
9 | +#undef TARGET_MAGELLAN |
10 | + |
11 | /* Define if you have Mandriva */ |
12 | #undef TARGET_MANDRIVA |
13 | |
14 | diff -Naur NetworkManager-0.9.0/configure.ac NetworkManager-0.9.0-magellan/configure.ac |
15 | --- NetworkManager-0.9.0/configure.ac 2011-08-23 03:33:07.000000000 +0200 |
16 | +++ NetworkManager-0.9.0-magellan/configure.ac 2011-08-26 22:25:50.000000000 +0200 |
17 | @@ -106,12 +106,13 @@ |
18 | dnl |
19 | AC_C_BIGENDIAN |
20 | |
21 | -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, linexa or exherbo])) |
22 | +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, magellan, debian, arch, slackware, paldo, mandriva, pardus, linexa or exherbo])) |
23 | if test "z$with_distro" = "z"; then |
24 | AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") |
25 | AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") |
26 | AC_CHECK_FILE(/etc/fedora-release,with_distro="redhat") |
27 | AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo") |
28 | + AC_CHECK_FILE(/etc/mageversion,with_distro="magellan") |
29 | AC_CHECK_FILE(/etc/debian_version,with_distro="debian") |
30 | AC_CHECK_FILE(/etc/arch-release,with_distro="arch") |
31 | AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware") |
32 | @@ -131,7 +132,7 @@ |
33 | exit 1 |
34 | else |
35 | case $with_distro in |
36 | - redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo) ;; |
37 | + redhat|suse|gentoo|magellan|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo) ;; |
38 | *) |
39 | echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" |
40 | exit 1 |
41 | @@ -154,6 +155,11 @@ |
42 | AC_DEFINE(TARGET_GENTOO, 1, [Define if you have Gentoo]) |
43 | fi |
44 | |
45 | +AM_CONDITIONAL(TARGET_MAGELLAN, test x"$with_distro" = xmagellan) |
46 | +if test x"$with_distro" = xmagellan; then |
47 | + AC_DEFINE(TARGET_MAGELLAN, 1, [Define if you have Magellan]) |
48 | +fi |
49 | + |
50 | AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian) |
51 | if test x"$with_distro" = xdebian; then |
52 | AC_DEFINE(TARGET_DEBIAN, 1, [Define if you have Debian]) |
53 | diff -Naur NetworkManager-0.9.0/src/backends/Makefile.am NetworkManager-0.9.0-magellan/src/backends/Makefile.am |
54 | --- NetworkManager-0.9.0/src/backends/Makefile.am 2011-07-22 00:46:18.000000000 +0200 |
55 | +++ NetworkManager-0.9.0-magellan/src/backends/Makefile.am 2011-08-26 22:20:51.000000000 +0200 |
56 | @@ -24,6 +24,10 @@ |
57 | libnmbackend_la_SOURCES += NetworkManagerGentoo.c |
58 | endif |
59 | |
60 | +if TARGET_MAGELLAN |
61 | +libnmbackend_la_SOURCES += NetworkManagerMagellan.c |
62 | +endif |
63 | + |
64 | if TARGET_DEBIAN |
65 | libnmbackend_la_SOURCES += NetworkManagerDebian.c |
66 | endif |
67 | diff -Naur NetworkManager-0.9.0/src/backends/Makefile.in NetworkManager-0.9.0-magellan/src/backends/Makefile.in |
68 | --- NetworkManager-0.9.0/src/backends/Makefile.in 2011-08-23 03:33:34.000000000 +0200 |
69 | +++ NetworkManager-0.9.0-magellan/src/backends/Makefile.in 2011-08-26 22:20:51.000000000 +0200 |
70 | @@ -47,6 +47,7 @@ |
71 | @TARGET_PARDUS_TRUE@am__append_11 = NetworkManagerPardus.c |
72 | @TARGET_LINEXA_TRUE@am__append_12 = NetworkManagerLinexa.c |
73 | @TARGET_EXHERBO_TRUE@am__append_13 = NetworkManagerExherbo.c |
74 | +@TARGET_MAGELLAN_TRUE@am__append_14 = NetworkManagerMagellan.c |
75 | subdir = src/backends |
76 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
77 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
78 | @@ -80,7 +81,7 @@ |
79 | NetworkManagerArch.c NetworkManagerPaldo.c \ |
80 | NetworkManagerFrugalware.c NetworkManagerMandriva.c \ |
81 | NetworkManagerPardus.c NetworkManagerLinexa.c \ |
82 | - NetworkManagerExherbo.c |
83 | + NetworkManagerExherbo.c NetworkManagerMagellan.c |
84 | @TARGET_REDHAT_TRUE@am__objects_1 = \ |
85 | @TARGET_REDHAT_TRUE@ libnmbackend_la-NetworkManagerRedHat.lo |
86 | @TARGET_SUSE_TRUE@am__objects_2 = \ |
87 | @@ -102,11 +103,14 @@ |
88 | @TARGET_LINEXA_TRUE@ libnmbackend_la-NetworkManagerLinexa.lo |
89 | @TARGET_EXHERBO_TRUE@am__objects_12 = \ |
90 | @TARGET_EXHERBO_TRUE@ libnmbackend_la-NetworkManagerExherbo.lo |
91 | +@TARGET_MAGELLAN_TRUE@am__objects_13 = \ |
92 | +@TARGET_MAGELLAN_TRUE@ libnmbackend_la-NetworkManagerMagellan.lo |
93 | am_libnmbackend_la_OBJECTS = libnmbackend_la-NetworkManagerGeneric.lo \ |
94 | $(am__objects_1) $(am__objects_2) $(am__objects_3) \ |
95 | $(am__objects_4) $(am__objects_5) $(am__objects_6) \ |
96 | $(am__objects_7) $(am__objects_8) $(am__objects_9) \ |
97 | - $(am__objects_10) $(am__objects_11) $(am__objects_12) |
98 | + $(am__objects_10) $(am__objects_11) $(am__objects_12) \ |
99 | + $(am__objects_13) |
100 | libnmbackend_la_OBJECTS = $(am_libnmbackend_la_OBJECTS) |
101 | AM_V_lt = $(am__v_lt_$(V)) |
102 | am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) |
103 | @@ -361,7 +365,7 @@ |
104 | $(am__append_3) $(am__append_4) $(am__append_5) \ |
105 | $(am__append_6) $(am__append_7) $(am__append_8) \ |
106 | $(am__append_10) $(am__append_11) $(am__append_12) \ |
107 | - $(am__append_13) |
108 | + $(am__append_13) $(am__append_14) |
109 | libnmbackend_la_LIBADD = $(am__append_9) \ |
110 | $(top_builddir)/src/logging/libnm-logging.la $(LIBNL_LIBS) \ |
111 | $(DBUS_LIBS) $(GLIB_LIBS) |
112 | @@ -432,6 +436,7 @@ |
113 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerFrugalware.Plo@am__quote@ |
114 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerGeneric.Plo@am__quote@ |
115 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerGentoo.Plo@am__quote@ |
116 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Plo@am__quote@ |
117 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerLinexa.Plo@am__quote@ |
118 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerMandriva.Plo@am__quote@ |
119 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerPaldo.Plo@am__quote@ |
120 | @@ -499,6 +504,14 @@ |
121 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
122 | @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerGentoo.lo `test -f 'NetworkManagerGentoo.c' || echo '$(srcdir)/'`NetworkManagerGentoo.c |
123 | |
124 | +libnmbackend_la-NetworkManagerMagellan.lo: NetworkManagerMagellan.c |
125 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerMagellan.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Tpo -c -o libnmbackend_la-NetworkManagerMagellan.lo `test -f 'NetworkManagerMagellan.c' || echo '$(srcdir)/'`NetworkManagerMagellan.c |
126 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Plo |
127 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
128 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='NetworkManagerMagellan.c' object='libnmbackend_la-NetworkManagerMagellan.lo' libtool=yes @AMDEPBACKSLASH@ |
129 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
130 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerMagellan.lo `test -f 'NetworkManagerMagellan.c' || echo '$(srcdir)/'`NetworkManagerMagellan.c |
131 | + |
132 | libnmbackend_la-NetworkManagerDebian.lo: NetworkManagerDebian.c |
133 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerDebian.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Tpo -c -o libnmbackend_la-NetworkManagerDebian.lo `test -f 'NetworkManagerDebian.c' || echo '$(srcdir)/'`NetworkManagerDebian.c |
134 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Plo |
135 | diff -Naur NetworkManager-0.9.0/src/backends/NetworkManagerMagellan.c NetworkManager-0.9.0-magellan/src/backends/NetworkManagerMagellan.c |
136 | --- NetworkManager-0.9.0/src/backends/NetworkManagerMagellan.c 1970-01-01 01:00:00.000000000 +0100 |
137 | +++ NetworkManager-0.9.0-magellan/src/backends/NetworkManagerMagellan.c 2011-08-26 22:20:51.000000000 +0200 |
138 | @@ -0,0 +1,90 @@ |
139 | +/* NetworkManager -- Network link manager |
140 | + * |
141 | + * Backend implementation for the Magellan Linux distribution http://www.magellan-linux.de |
142 | + * |
143 | + * Niels Rogalla <niro@magellan-linux.de> |
144 | + * |
145 | + * Heavily based on NetworkManagerGentoo.c by Robert Paskowitz |
146 | + * |
147 | + * Dan Williams <dcbw@redhat.com> |
148 | + * Dan Willemsen <dan@willemsen.us> |
149 | + * Robert Paskowitz |
150 | + * |
151 | + * This program is free software; you can redistribute it and/or modify |
152 | + * it under the terms of the GNU General Public License as published by |
153 | + * the Free Software Foundation; either version 2 of the License, or |
154 | + * (at your option) any later version. |
155 | + * |
156 | + * This program is distributed in the hope that it will be useful, |
157 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
158 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
159 | + * GNU General Public License for more details. |
160 | + * |
161 | + * You should have received a copy of the GNU General Public License along |
162 | + * with this program; if not, write to the Free Software Foundation, Inc., |
163 | + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
164 | + * |
165 | + * (C) Copyright 2004 Red Hat, Inc. |
166 | + * (C) Copyright 2004 Dan Willemsen |
167 | + * (C) Copyright 2004 Robert Paskowitz |
168 | + */ |
169 | + |
170 | +#ifdef HAVE_CONFIG_H |
171 | +#include <config.h> |
172 | +#endif |
173 | + |
174 | +#include <stdio.h> |
175 | +#include <string.h> |
176 | +#include <stdlib.h> |
177 | +#include <gio/gio.h> |
178 | + |
179 | +#include "NetworkManagerGeneric.h" |
180 | +#include "nm-system.h" |
181 | +#include "NetworkManagerUtils.h" |
182 | +#include "nm-logging.h" |
183 | + |
184 | +#define BUFFER_SIZE 512 |
185 | + |
186 | +static void sysvinit_start_lo_if_necessary() |
187 | +{ |
188 | + /* No need to run net.lo if it is already running */ |
189 | + if (nm_spawn_process ("/etc/rc.d/init.d/localnet status") != 0) |
190 | + nm_spawn_process ("/etc/rc.d/init.d/localnet start"); |
191 | +} |
192 | + |
193 | +/* |
194 | + * nm_system_enable_loopback |
195 | + * |
196 | + * Bring up the loopback interface |
197 | + * |
198 | + */ |
199 | +void nm_system_enable_loopback (void) |
200 | +{ |
201 | + gchar *comm = NULL; |
202 | + |
203 | + if (g_strstr_len (comm, -1, "systemd")) { |
204 | + /* We use the generic loopback enabler if using systemd. */ |
205 | + nm_log_info (LOGD_CORE, "NetworkManager is running with systemd..."); |
206 | + nm_generic_enable_loopback (); |
207 | + } else { |
208 | + /* SySVInit otherwise. */ |
209 | + nm_log_info (LOGD_CORE, "NetworkManager is running with SySVInit..."); |
210 | + sysvinit_start_lo_if_necessary(); |
211 | + } |
212 | +} |
213 | + |
214 | +/* |
215 | + * nm_system_update_dns |
216 | + * |
217 | + * Make glibc/nscd aware of any changes to the resolv.conf file by |
218 | + * restarting nscd. Only restart if already running. |
219 | + * |
220 | + */ |
221 | +void nm_system_update_dns (void) |
222 | +{ |
223 | + if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { |
224 | + nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); |
225 | + nm_spawn_process ("/usr/sbin/nscd -i hosts"); |
226 | + } |
227 | +} |
228 | + |
229 | diff -Naur NetworkManager-0.9.0/src/dhcp-manager/nm-dhcp-dhclient.c NetworkManager-0.9.0-magellan/src/dhcp-manager/nm-dhcp-dhclient.c |
230 | --- NetworkManager-0.9.0/src/dhcp-manager/nm-dhcp-dhclient.c 2011-08-23 01:16:06.000000000 +0200 |
231 | +++ NetworkManager-0.9.0-magellan/src/dhcp-manager/nm-dhcp-dhclient.c 2011-08-26 22:20:51.000000000 +0200 |
232 | @@ -357,7 +357,7 @@ |
233 | |
234 | #if defined(TARGET_SUSE) |
235 | orig = g_strdup (SYSCONFDIR "/dhclient.conf"); |
236 | -#elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO) |
237 | +#elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO) || defined(TARGET_MAGELLAN) |
238 | #if defined(DHCLIENT_V3) |
239 | orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf"); |
240 | #else |
241 | @@ -372,7 +372,7 @@ |
242 | return NULL; |
243 | } |
244 | |
245 | -#if !defined(TARGET_SUSE) && !defined(TARGET_DEBIAN) && !defined(TARGET_GENTOO) |
246 | +#if !defined(TARGET_SUSE) && !defined(TARGET_DEBIAN) && !defined(TARGET_GENTOO) && !defined(TARGET_MAGELLAN) |
247 | /* Try /etc/dhcp/ too (rh #607759) */ |
248 | if (!g_file_test (orig, G_FILE_TEST_EXISTS)) { |
249 | g_free (orig); |