Magellan Linux

Contents of /trunk/networkmanager/patches/networkmanager-0.8.1-magellan.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1154 - (show annotations) (download)
Mon Sep 27 20:29:28 2010 UTC (14 years, 1 month ago) by niro
File size: 31465 byte(s)
-rebased against 0.8.1
1 diff -Naur NetworkManager-0.8.1/config.h.in NetworkManager-0.8.1-magellan/config.h.in
2 --- NetworkManager-0.8.1/config.h.in 2010-07-22 01:51:01.000000000 +0200
3 +++ NetworkManager-0.8.1-magellan/config.h.in 2010-09-27 22:34:30.000000000 +0200
4 @@ -145,6 +145,9 @@
5 /* Define if you have Gentoo */
6 #undef TARGET_GENTOO
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.8.1/configure.ac NetworkManager-0.8.1-magellan/configure.ac
15 --- NetworkManager-0.8.1/configure.ac 2010-07-22 01:50:34.000000000 +0200
16 +++ NetworkManager-0.8.1-magellan/configure.ac 2010-09-27 22:08:45.000000000 +0200
17 @@ -83,12 +83,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 or pardus]))
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 or pardus]))
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 @@ -106,7 +107,7 @@
33 exit 1
34 else
35 case $with_distro in
36 - redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus) ;;
37 + redhat|suse|gentoo|magellan|debian|slackware|arch|paldo|frugalware|mandriva|pardus) ;;
38 *)
39 echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)"
40 exit 1
41 @@ -129,6 +130,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 @@ -489,6 +495,8 @@
54 initscript/RedHat/NetworkManager
55 initscript/Gentoo/Makefile
56 initscript/Gentoo/NetworkManager
57 +initscript/Magellan/Makefile
58 +initscript/Magellan/NetworkManager
59 initscript/Debian/Makefile
60 initscript/Debian/NetworkManager
61 initscript/Slackware/Makefile
62 diff -Naur NetworkManager-0.8.1/initscript/Magellan/Makefile.am NetworkManager-0.8.1-magellan/initscript/Magellan/Makefile.am
63 --- NetworkManager-0.8.1/initscript/Magellan/Makefile.am 1970-01-01 01:00:00.000000000 +0100
64 +++ NetworkManager-0.8.1-magellan/initscript/Magellan/Makefile.am 2010-09-27 22:09:06.000000000 +0200
65 @@ -0,0 +1,5 @@
66 +EXTRA_DIST = NetworkManager
67 +DISTCLEANFILES = NetworkManager
68 +
69 +initddir = $(sysconfdir)/init.d
70 +initd_SCRIPTS = NetworkManager
71 diff -Naur NetworkManager-0.8.1/initscript/Magellan/Makefile.in NetworkManager-0.8.1-magellan/initscript/Magellan/Makefile.in
72 --- NetworkManager-0.8.1/initscript/Magellan/Makefile.in 1970-01-01 01:00:00.000000000 +0100
73 +++ NetworkManager-0.8.1-magellan/initscript/Magellan/Makefile.in 2010-09-27 22:11:29.000000000 +0200
74 @@ -0,0 +1,487 @@
75 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
76 +# @configure_input@
77 +
78 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
79 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
80 +# Inc.
81 +# This Makefile.in is free software; the Free Software Foundation
82 +# gives unlimited permission to copy and/or distribute it,
83 +# with or without modifications, as long as this notice is preserved.
84 +
85 +# This program is distributed in the hope that it will be useful,
86 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
87 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
88 +# PARTICULAR PURPOSE.
89 +
90 +@SET_MAKE@
91 +
92 +VPATH = @srcdir@
93 +pkgdatadir = $(datadir)/@PACKAGE@
94 +pkgincludedir = $(includedir)/@PACKAGE@
95 +pkglibdir = $(libdir)/@PACKAGE@
96 +pkglibexecdir = $(libexecdir)/@PACKAGE@
97 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
98 +install_sh_DATA = $(install_sh) -c -m 644
99 +install_sh_PROGRAM = $(install_sh) -c
100 +install_sh_SCRIPT = $(install_sh) -c
101 +INSTALL_HEADER = $(INSTALL_DATA)
102 +transform = $(program_transform_name)
103 +NORMAL_INSTALL = :
104 +PRE_INSTALL = :
105 +POST_INSTALL = :
106 +NORMAL_UNINSTALL = :
107 +PRE_UNINSTALL = :
108 +POST_UNINSTALL = :
109 +build_triplet = @build@
110 +host_triplet = @host@
111 +subdir = initscript/Magellan
112 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
113 + $(srcdir)/NetworkManager.in
114 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
115 +am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
116 + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
117 + $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
118 + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
119 + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
120 + $(top_srcdir)/configure.ac
121 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
122 + $(ACLOCAL_M4)
123 +mkinstalldirs = $(install_sh) -d
124 +CONFIG_HEADER = $(top_builddir)/config.h
125 +CONFIG_CLEAN_FILES = NetworkManager
126 +CONFIG_CLEAN_VPATH_FILES =
127 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
128 +am__vpath_adj = case $$p in \
129 + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
130 + *) f=$$p;; \
131 + esac;
132 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
133 +am__install_max = 40
134 +am__nobase_strip_setup = \
135 + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
136 +am__nobase_strip = \
137 + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
138 +am__nobase_list = $(am__nobase_strip_setup); \
139 + for p in $$list; do echo "$$p $$p"; done | \
140 + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
141 + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
142 + if (++n[$$2] == $(am__install_max)) \
143 + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
144 + END { for (dir in files) print dir, files[dir] }'
145 +am__base_list = \
146 + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
147 + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
148 +am__installdirs = "$(DESTDIR)$(initddir)"
149 +SCRIPTS = $(initd_SCRIPTS)
150 +SOURCES =
151 +DIST_SOURCES =
152 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
153 +ACLOCAL = @ACLOCAL@
154 +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
155 +ALL_LINGUAS = @ALL_LINGUAS@
156 +AMTAR = @AMTAR@
157 +AR = @AR@
158 +AUTOCONF = @AUTOCONF@
159 +AUTOHEADER = @AUTOHEADER@
160 +AUTOMAKE = @AUTOMAKE@
161 +AWK = @AWK@
162 +CATALOGS = @CATALOGS@
163 +CATOBJEXT = @CATOBJEXT@
164 +CC = @CC@
165 +CCDEPMODE = @CCDEPMODE@
166 +CFLAGS = @CFLAGS@
167 +CPP = @CPP@
168 +CPPFLAGS = @CPPFLAGS@
169 +CYGPATH_W = @CYGPATH_W@
170 +DATADIRNAME = @DATADIRNAME@
171 +DBUS_CFLAGS = @DBUS_CFLAGS@
172 +DBUS_LIBS = @DBUS_LIBS@
173 +DBUS_SYS_DIR = @DBUS_SYS_DIR@
174 +DEFS = @DEFS@
175 +DEPDIR = @DEPDIR@
176 +DHCLIENT_PATH = @DHCLIENT_PATH@
177 +DHCPCD_PATH = @DHCPCD_PATH@
178 +DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
179 +DSYMUTIL = @DSYMUTIL@
180 +DUMPBIN = @DUMPBIN@
181 +ECHO_C = @ECHO_C@
182 +ECHO_N = @ECHO_N@
183 +ECHO_T = @ECHO_T@
184 +EGREP = @EGREP@
185 +EXEEXT = @EXEEXT@
186 +FGREP = @FGREP@
187 +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
188 +GIO_CFLAGS = @GIO_CFLAGS@
189 +GIO_LIBS = @GIO_LIBS@
190 +GLIB_CFLAGS = @GLIB_CFLAGS@
191 +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
192 +GLIB_LIBS = @GLIB_LIBS@
193 +GMODULE_CFLAGS = @GMODULE_CFLAGS@
194 +GMODULE_LIBS = @GMODULE_LIBS@
195 +GMOFILES = @GMOFILES@
196 +GMSGFMT = @GMSGFMT@
197 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
198 +GNUTLS_LIBS = @GNUTLS_LIBS@
199 +GREP = @GREP@
200 +GTKDOC_CHECK = @GTKDOC_CHECK@
201 +GTKDOC_MKPDF = @GTKDOC_MKPDF@
202 +GTKDOC_REBASE = @GTKDOC_REBASE@
203 +GUDEV_CFLAGS = @GUDEV_CFLAGS@
204 +GUDEV_LIBS = @GUDEV_LIBS@
205 +HTML_DIR = @HTML_DIR@
206 +INSTALL = @INSTALL@
207 +INSTALL_DATA = @INSTALL_DATA@
208 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
209 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
210 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
211 +INSTOBJEXT = @INSTOBJEXT@
212 +INTLLIBS = @INTLLIBS@
213 +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
214 +INTLTOOL_MERGE = @INTLTOOL_MERGE@
215 +INTLTOOL_PERL = @INTLTOOL_PERL@
216 +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
217 +IPTABLES_PATH = @IPTABLES_PATH@
218 +LD = @LD@
219 +LDFLAGS = @LDFLAGS@
220 +LIBDL = @LIBDL@
221 +LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
222 +LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
223 +LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
224 +LIBM = @LIBM@
225 +LIBNL_CFLAGS = @LIBNL_CFLAGS@
226 +LIBNL_LIBS = @LIBNL_LIBS@
227 +LIBOBJS = @LIBOBJS@
228 +LIBS = @LIBS@
229 +LIBTOOL = @LIBTOOL@
230 +LIPO = @LIPO@
231 +LN_S = @LN_S@
232 +LTLIBOBJS = @LTLIBOBJS@
233 +MAINT = @MAINT@
234 +MAKEINFO = @MAKEINFO@
235 +MKDIR_P = @MKDIR_P@
236 +MKINSTALLDIRS = @MKINSTALLDIRS@
237 +MSGFMT = @MSGFMT@
238 +MSGFMT_OPTS = @MSGFMT_OPTS@
239 +MSGMERGE = @MSGMERGE@
240 +NM = @NM@
241 +NMEDIT = @NMEDIT@
242 +NSS_CFLAGS = @NSS_CFLAGS@
243 +NSS_LIBS = @NSS_LIBS@
244 +OBJDUMP = @OBJDUMP@
245 +OBJEXT = @OBJEXT@
246 +OTOOL = @OTOOL@
247 +OTOOL64 = @OTOOL64@
248 +PACKAGE = @PACKAGE@
249 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
250 +PACKAGE_NAME = @PACKAGE_NAME@
251 +PACKAGE_STRING = @PACKAGE_STRING@
252 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
253 +PACKAGE_URL = @PACKAGE_URL@
254 +PACKAGE_VERSION = @PACKAGE_VERSION@
255 +PATH_SEPARATOR = @PATH_SEPARATOR@
256 +PKG_CONFIG = @PKG_CONFIG@
257 +POFILES = @POFILES@
258 +POLKIT_CFLAGS = @POLKIT_CFLAGS@
259 +POLKIT_LIBS = @POLKIT_LIBS@
260 +POSUB = @POSUB@
261 +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
262 +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
263 +PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
264 +RANLIB = @RANLIB@
265 +RESOLVCONF_PATH = @RESOLVCONF_PATH@
266 +SED = @SED@
267 +SET_MAKE = @SET_MAKE@
268 +SHELL = @SHELL@
269 +STRIP = @STRIP@
270 +SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
271 +UDEV_BASE_DIR = @UDEV_BASE_DIR@
272 +USE_NLS = @USE_NLS@
273 +UUID_CFLAGS = @UUID_CFLAGS@
274 +UUID_LIBS = @UUID_LIBS@
275 +VERSION = @VERSION@
276 +XGETTEXT = @XGETTEXT@
277 +abs_builddir = @abs_builddir@
278 +abs_srcdir = @abs_srcdir@
279 +abs_top_builddir = @abs_top_builddir@
280 +abs_top_srcdir = @abs_top_srcdir@
281 +ac_ct_CC = @ac_ct_CC@
282 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
283 +am__include = @am__include@
284 +am__leading_dot = @am__leading_dot@
285 +am__quote = @am__quote@
286 +am__tar = @am__tar@
287 +am__untar = @am__untar@
288 +bindir = @bindir@
289 +build = @build@
290 +build_alias = @build_alias@
291 +build_cpu = @build_cpu@
292 +build_os = @build_os@
293 +build_vendor = @build_vendor@
294 +builddir = @builddir@
295 +datadir = @datadir@
296 +datarootdir = @datarootdir@
297 +docdir = @docdir@
298 +dvidir = @dvidir@
299 +exec_prefix = @exec_prefix@
300 +host = @host@
301 +host_alias = @host_alias@
302 +host_cpu = @host_cpu@
303 +host_os = @host_os@
304 +host_vendor = @host_vendor@
305 +htmldir = @htmldir@
306 +includedir = @includedir@
307 +infodir = @infodir@
308 +install_sh = @install_sh@
309 +libdir = @libdir@
310 +libexecdir = @libexecdir@
311 +localedir = @localedir@
312 +localstatedir = @localstatedir@
313 +lt_ECHO = @lt_ECHO@
314 +mandir = @mandir@
315 +mkdir_p = @mkdir_p@
316 +oldincludedir = @oldincludedir@
317 +pdfdir = @pdfdir@
318 +prefix = @prefix@
319 +program_transform_name = @program_transform_name@
320 +psdir = @psdir@
321 +sbindir = @sbindir@
322 +sharedstatedir = @sharedstatedir@
323 +srcdir = @srcdir@
324 +sysconfdir = @sysconfdir@
325 +target_alias = @target_alias@
326 +top_build_prefix = @top_build_prefix@
327 +top_builddir = @top_builddir@
328 +top_srcdir = @top_srcdir@
329 +EXTRA_DIST = NetworkManager
330 +DISTCLEANFILES = NetworkManager
331 +initddir = $(sysconfdir)/init.d
332 +initd_SCRIPTS = NetworkManager
333 +all: all-am
334 +
335 +.SUFFIXES:
336 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
337 + @for dep in $?; do \
338 + case '$(am__configure_deps)' in \
339 + *$$dep*) \
340 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
341 + && { if test -f $@; then exit 0; else break; fi; }; \
342 + exit 1;; \
343 + esac; \
344 + done; \
345 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu initscript/Magellan/Makefile'; \
346 + $(am__cd) $(top_srcdir) && \
347 + $(AUTOMAKE) --gnu initscript/Magellan/Makefile
348 +.PRECIOUS: Makefile
349 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
350 + @case '$?' in \
351 + *config.status*) \
352 + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
353 + *) \
354 + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
355 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
356 + esac;
357 +
358 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
359 + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
360 +
361 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
362 + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
363 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
364 + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
365 +$(am__aclocal_m4_deps):
366 +NetworkManager: $(top_builddir)/config.status $(srcdir)/NetworkManager.in
367 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
368 +install-initdSCRIPTS: $(initd_SCRIPTS)
369 + @$(NORMAL_INSTALL)
370 + test -z "$(initddir)" || $(MKDIR_P) "$(DESTDIR)$(initddir)"
371 + @list='$(initd_SCRIPTS)'; test -n "$(initddir)" || list=; \
372 + for p in $$list; do \
373 + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
374 + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
375 + done | \
376 + sed -e 'p;s,.*/,,;n' \
377 + -e 'h;s|.*|.|' \
378 + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
379 + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
380 + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
381 + if ($$2 == $$4) { files[d] = files[d] " " $$1; \
382 + if (++n[d] == $(am__install_max)) { \
383 + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
384 + else { print "f", d "/" $$4, $$1 } } \
385 + END { for (d in files) print "f", d, files[d] }' | \
386 + while read type dir files; do \
387 + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
388 + test -z "$$files" || { \
389 + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(initddir)$$dir'"; \
390 + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(initddir)$$dir" || exit $$?; \
391 + } \
392 + ; done
393 +
394 +uninstall-initdSCRIPTS:
395 + @$(NORMAL_UNINSTALL)
396 + @list='$(initd_SCRIPTS)'; test -n "$(initddir)" || exit 0; \
397 + files=`for p in $$list; do echo "$$p"; done | \
398 + sed -e 's,.*/,,;$(transform)'`; \
399 + test -n "$$list" || exit 0; \
400 + echo " ( cd '$(DESTDIR)$(initddir)' && rm -f" $$files ")"; \
401 + cd "$(DESTDIR)$(initddir)" && rm -f $$files
402 +
403 +mostlyclean-libtool:
404 + -rm -f *.lo
405 +
406 +clean-libtool:
407 + -rm -rf .libs _libs
408 +tags: TAGS
409 +TAGS:
410 +
411 +ctags: CTAGS
412 +CTAGS:
413 +
414 +
415 +distdir: $(DISTFILES)
416 + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
417 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
418 + list='$(DISTFILES)'; \
419 + dist_files=`for file in $$list; do echo $$file; done | \
420 + sed -e "s|^$$srcdirstrip/||;t" \
421 + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
422 + case $$dist_files in \
423 + */*) $(MKDIR_P) `echo "$$dist_files" | \
424 + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
425 + sort -u` ;; \
426 + esac; \
427 + for file in $$dist_files; do \
428 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
429 + if test -d $$d/$$file; then \
430 + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
431 + if test -d "$(distdir)/$$file"; then \
432 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
433 + fi; \
434 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
435 + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
436 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
437 + fi; \
438 + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
439 + else \
440 + test -f "$(distdir)/$$file" \
441 + || cp -p $$d/$$file "$(distdir)/$$file" \
442 + || exit 1; \
443 + fi; \
444 + done
445 +check-am: all-am
446 +check: check-am
447 +all-am: Makefile $(SCRIPTS)
448 +installdirs:
449 + for dir in "$(DESTDIR)$(initddir)"; do \
450 + test -z "$$dir" || $(MKDIR_P) "$$dir"; \
451 + done
452 +install: install-am
453 +install-exec: install-exec-am
454 +install-data: install-data-am
455 +uninstall: uninstall-am
456 +
457 +install-am: all-am
458 + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
459 +
460 +installcheck: installcheck-am
461 +install-strip:
462 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
463 + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
464 + `test -z '$(STRIP)' || \
465 + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
466 +mostlyclean-generic:
467 +
468 +clean-generic:
469 +
470 +distclean-generic:
471 + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
472 + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
473 + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
474 +
475 +maintainer-clean-generic:
476 + @echo "This command is intended for maintainers to use"
477 + @echo "it deletes files that may require special tools to rebuild."
478 +clean: clean-am
479 +
480 +clean-am: clean-generic clean-libtool mostlyclean-am
481 +
482 +distclean: distclean-am
483 + -rm -f Makefile
484 +distclean-am: clean-am distclean-generic
485 +
486 +dvi: dvi-am
487 +
488 +dvi-am:
489 +
490 +html: html-am
491 +
492 +html-am:
493 +
494 +info: info-am
495 +
496 +info-am:
497 +
498 +install-data-am: install-initdSCRIPTS
499 +
500 +install-dvi: install-dvi-am
501 +
502 +install-dvi-am:
503 +
504 +install-exec-am:
505 +
506 +install-html: install-html-am
507 +
508 +install-html-am:
509 +
510 +install-info: install-info-am
511 +
512 +install-info-am:
513 +
514 +install-man:
515 +
516 +install-pdf: install-pdf-am
517 +
518 +install-pdf-am:
519 +
520 +install-ps: install-ps-am
521 +
522 +install-ps-am:
523 +
524 +installcheck-am:
525 +
526 +maintainer-clean: maintainer-clean-am
527 + -rm -f Makefile
528 +maintainer-clean-am: distclean-am maintainer-clean-generic
529 +
530 +mostlyclean: mostlyclean-am
531 +
532 +mostlyclean-am: mostlyclean-generic mostlyclean-libtool
533 +
534 +pdf: pdf-am
535 +
536 +pdf-am:
537 +
538 +ps: ps-am
539 +
540 +ps-am:
541 +
542 +uninstall-am: uninstall-initdSCRIPTS
543 +
544 +.MAKE: install-am install-strip
545 +
546 +.PHONY: all all-am check check-am clean clean-generic clean-libtool \
547 + distclean distclean-generic distclean-libtool distdir dvi \
548 + dvi-am html html-am info info-am install install-am \
549 + install-data install-data-am install-dvi install-dvi-am \
550 + install-exec install-exec-am install-html install-html-am \
551 + install-info install-info-am install-initdSCRIPTS install-man \
552 + install-pdf install-pdf-am install-ps install-ps-am \
553 + install-strip installcheck installcheck-am installdirs \
554 + maintainer-clean maintainer-clean-generic mostlyclean \
555 + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
556 + uninstall uninstall-am uninstall-initdSCRIPTS
557 +
558 +
559 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
560 +# Otherwise a system limit (for SysV at least) may be exceeded.
561 +.NOEXPORT:
562 diff -Naur NetworkManager-0.8.1/initscript/Magellan/NetworkManager NetworkManager-0.8.1-magellan/initscript/Magellan/NetworkManager
563 --- NetworkManager-0.8.1/initscript/Magellan/NetworkManager 1970-01-01 01:00:00.000000000 +0100
564 +++ NetworkManager-0.8.1-magellan/initscript/Magellan/NetworkManager 2010-09-27 22:13:42.000000000 +0200
565 @@ -0,0 +1,50 @@
566 +#!/bin/bash
567 +# $Header: /root/magellan-cvs/src/networkmanager/networkmanager.rc,v 1.1 2010-02-13 11:25:26 niro Exp $
568 +
569 +#%rlevels: 3:s 4:s 5:s 0:k 1:k 2:k 6:k
570 +#%start: 30
571 +#%stop: 20
572 +
573 +#deps
574 +#%needs:
575 +#%before:
576 +#%after:
577 +
578 +source /etc/conf.d/rc
579 +source $rc_functions
580 +
581 +case "$1" in
582 + start)
583 + echo -e ${COLOREDSTAR}"Starting NetworkManager ..."
584 + start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid \
585 + --exec /usr/sbin/NetworkManager -- --pid-file /var/run/NetworkManager.pid
586 + evaluate_retval
587 +
588 + update_svcstatus $1
589 + splash svc_started "$(basename $0)" 0
590 + ;;
591 +
592 + stop)
593 + echo -e ${COLOREDSTAR}"Stopping NetworkManager ..."
594 + start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManager.pid
595 + evaluate_retval
596 +
597 + update_svcstatus $1
598 + splash svc_stopped "$(basename $0)" 0
599 + ;;
600 +
601 + restart)
602 + $0 stop
603 + sleep 1
604 + $0 start
605 + ;;
606 +
607 + status)
608 + statusproc /usr/sbin/NetworkManager
609 + ;;
610 +
611 + *)
612 + echo "Usage: $0 {start|stop|restart|status}"
613 + exit 1
614 + ;;
615 +esac
616 diff -Naur NetworkManager-0.8.1/initscript/Magellan/NetworkManager.in NetworkManager-0.8.1-magellan/initscript/Magellan/NetworkManager.in
617 --- NetworkManager-0.8.1/initscript/Magellan/NetworkManager.in 1970-01-01 01:00:00.000000000 +0100
618 +++ NetworkManager-0.8.1-magellan/initscript/Magellan/NetworkManager.in 2010-09-27 22:13:50.000000000 +0200
619 @@ -0,0 +1,50 @@
620 +#!/bin/bash
621 +# $Header: /root/magellan-cvs/src/networkmanager/networkmanager.rc,v 1.1 2010-02-13 11:25:26 niro Exp $
622 +
623 +#%rlevels: 3:s 4:s 5:s 0:k 1:k 2:k 6:k
624 +#%start: 30
625 +#%stop: 20
626 +
627 +#deps
628 +#%needs:
629 +#%before:
630 +#%after:
631 +
632 +source /etc/conf.d/rc
633 +source $rc_functions
634 +
635 +case "$1" in
636 + start)
637 + echo -e ${COLOREDSTAR}"Starting NetworkManager ..."
638 + start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid \
639 + --exec /usr/sbin/NetworkManager -- --pid-file /var/run/NetworkManager.pid
640 + evaluate_retval
641 +
642 + update_svcstatus $1
643 + splash svc_started "$(basename $0)" 0
644 + ;;
645 +
646 + stop)
647 + echo -e ${COLOREDSTAR}"Stopping NetworkManager ..."
648 + start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManager.pid
649 + evaluate_retval
650 +
651 + update_svcstatus $1
652 + splash svc_stopped "$(basename $0)" 0
653 + ;;
654 +
655 + restart)
656 + $0 stop
657 + sleep 1
658 + $0 start
659 + ;;
660 +
661 + status)
662 + statusproc /usr/sbin/NetworkManager
663 + ;;
664 +
665 + *)
666 + echo "Usage: $0 {start|stop|restart|status}"
667 + exit 1
668 + ;;
669 +esac
670 diff -Naur NetworkManager-0.8.1/initscript/Makefile.am NetworkManager-0.8.1-magellan/initscript/Makefile.am
671 --- NetworkManager-0.8.1/initscript/Makefile.am 2009-12-23 19:30:29.000000000 +0100
672 +++ NetworkManager-0.8.1-magellan/initscript/Makefile.am 2010-09-27 22:15:03.000000000 +0200
673 @@ -5,6 +5,9 @@
674 if TARGET_GENTOO
675 SUBDIRS += Gentoo
676 endif
677 +if TARGET_MAGELLAN
678 +SUBDIRS += Magellan
679 +endif
680 if TARGET_DEBIAN
681 SUBDIRS += Debian
682 endif
683 diff -Naur NetworkManager-0.8.1/initscript/Makefile.in NetworkManager-0.8.1-magellan/initscript/Makefile.in
684 --- NetworkManager-0.8.1/initscript/Makefile.in 2010-07-22 01:50:48.000000000 +0200
685 +++ NetworkManager-0.8.1-magellan/initscript/Makefile.in 2010-09-27 22:15:58.000000000 +0200
686 @@ -41,6 +41,7 @@
687 @TARGET_ARCH_TRUE@am__append_6 = Arch
688 @TARGET_PALDO_TRUE@am__append_7 = paldo
689 @TARGET_MANDRIVA_TRUE@am__append_8 = Mandriva
690 +@TARGET_MAGELLAN_TRUE@am__append_9 = Magellan
691 subdir = initscript
692 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
693 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
694 @@ -72,7 +73,7 @@
695 distdir
696 ETAGS = etags
697 CTAGS = ctags
698 -DIST_SUBDIRS = RedHat Gentoo Debian Slackware SUSE Arch paldo Mandriva
699 +DIST_SUBDIRS = RedHat Gentoo Magellan Debian Slackware SUSE Arch paldo Mandriva
700 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
701 am__relativize = \
702 dir0=`pwd`; \
703 diff -Naur NetworkManager-0.8.1/src/backends/Makefile.am NetworkManager-0.8.1-magellan/src/backends/Makefile.am
704 --- NetworkManager-0.8.1/src/backends/Makefile.am 2010-06-30 20:55:33.000000000 +0200
705 +++ NetworkManager-0.8.1-magellan/src/backends/Makefile.am 2010-09-27 22:24:20.000000000 +0200
706 @@ -26,6 +26,10 @@
707 libnmbackend_la_SOURCES += NetworkManagerGentoo.c
708 endif
709
710 +if TARGET_MAGELLAN
711 +libnmbackend_la_SOURCES += NetworkManagerMagellan.c
712 +endif
713 +
714 if TARGET_DEBIAN
715 libnmbackend_la_SOURCES += NetworkManagerDebian.c
716 endif
717 diff -Naur NetworkManager-0.8.1/src/backends/Makefile.in NetworkManager-0.8.1-magellan/src/backends/Makefile.in
718 --- NetworkManager-0.8.1/src/backends/Makefile.in 2010-07-22 01:50:50.000000000 +0200
719 +++ NetworkManager-0.8.1-magellan/src/backends/Makefile.in 2010-09-27 22:31:36.000000000 +0200
720 @@ -45,6 +45,7 @@
721 @TARGET_FRUGALWARE_TRUE@am__append_9 = -lfwnetconfig -lfwutil
722 @TARGET_MANDRIVA_TRUE@am__append_10 = NetworkManagerMandriva.c
723 @TARGET_PARDUS_TRUE@am__append_11 = NetworkManagerPardus.c
724 +@TARGET_MAGELLAN_TRUE@am__append_12 = NetworkManagerMagellan.c
725 subdir = src/backends
726 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
727 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
728 @@ -71,7 +72,7 @@
729 NetworkManagerDebian.c NetworkManagerSlackware.c \
730 NetworkManagerArch.c NetworkManagerPaldo.c \
731 NetworkManagerFrugalware.c NetworkManagerMandriva.c \
732 - NetworkManagerPardus.c
733 + NetworkManagerPardus.c NetworkManagerMagellan.c
734 @TARGET_REDHAT_TRUE@am__objects_1 = \
735 @TARGET_REDHAT_TRUE@ libnmbackend_la-NetworkManagerRedHat.lo
736 @TARGET_SUSE_TRUE@am__objects_2 = \
737 @@ -89,11 +90,13 @@
738 @TARGET_MANDRIVA_TRUE@am__objects_9 = libnmbackend_la-NetworkManagerMandriva.lo
739 @TARGET_PARDUS_TRUE@am__objects_10 = \
740 @TARGET_PARDUS_TRUE@ libnmbackend_la-NetworkManagerPardus.lo
741 +@TARGET_MAGELLAN_TRUE@am__objects_11 = \
742 +@TARGET_MAGELLAN_TRUE@ libnmbackend_la-NetworkManagerMagellan.lo
743 am_libnmbackend_la_OBJECTS = libnmbackend_la-NetworkManagerGeneric.lo \
744 $(am__objects_1) $(am__objects_2) $(am__objects_3) \
745 $(am__objects_4) $(am__objects_5) $(am__objects_6) \
746 $(am__objects_7) $(am__objects_8) $(am__objects_9) \
747 - $(am__objects_10)
748 + $(am__objects_10) $(am__objects_11)
749 libnmbackend_la_OBJECTS = $(am_libnmbackend_la_OBJECTS)
750 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
751 depcomp = $(SHELL) $(top_srcdir)/depcomp
752 @@ -303,7 +306,7 @@
753 NetworkManagerGeneric.h $(am__append_1) $(am__append_2) \
754 $(am__append_3) $(am__append_4) $(am__append_5) \
755 $(am__append_6) $(am__append_7) $(am__append_8) \
756 - $(am__append_10) $(am__append_11)
757 + $(am__append_10) $(am__append_11) $(am__append_12)
758 libnmbackend_la_LIBADD = $(am__append_9) \
759 $(top_builddir)/src/logging/libnm-logging.la $(DBUS_LIBS) \
760 $(GLIB_LIBS)
761 @@ -372,6 +375,7 @@
762 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerFrugalware.Plo@am__quote@
763 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerGeneric.Plo@am__quote@
764 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerGentoo.Plo@am__quote@
765 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Plo@am__quote@
766 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerMandriva.Plo@am__quote@
767 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerPaldo.Plo@am__quote@
768 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerPardus.Plo@am__quote@
769 @@ -431,6 +435,13 @@
770 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
771 @am__fastdepCC_FALSE@ $(LIBTOOL) --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
772
773 +libnmbackend_la-NetworkManagerMagellan.lo: NetworkManagerMagellan.c
774 +@am__fastdepCC_TRUE@ $(LIBTOOL) --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
775 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Plo
776 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='NetworkManagerMagellan.c' object='libnmbackend_la-NetworkManagerMagellan.lo' libtool=yes @AMDEPBACKSLASH@
777 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
778 +@am__fastdepCC_FALSE@ $(LIBTOOL) --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
779 +
780 libnmbackend_la-NetworkManagerDebian.lo: NetworkManagerDebian.c
781 @am__fastdepCC_TRUE@ $(LIBTOOL) --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
782 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Plo
783 diff -Naur NetworkManager-0.8.1/src/backends/NetworkManagerMagellan.c NetworkManager-0.8.1-magellan/src/backends/NetworkManagerMagellan.c
784 --- NetworkManager-0.8.1/src/backends/NetworkManagerMagellan.c 1970-01-01 01:00:00.000000000 +0100
785 +++ NetworkManager-0.8.1-magellan/src/backends/NetworkManagerMagellan.c 2010-09-27 22:22:51.000000000 +0200
786 @@ -0,0 +1,67 @@
787 +/* NetworkManager -- Network link manager
788 + *
789 + * Backend implementation for the Magellan Linux distribution http://www.magellan-linux.de
790 + *
791 + * Niels Rogalla <niro@magellan-linux.de>
792 + *
793 + * Heavily based on NetworkManagerGentoo.c by Robert Paskowitz
794 + *
795 + * This program is free software; you can redistribute it and/or modify
796 + * it under the terms of the GNU General Public License as published by
797 + * the Free Software Foundation; either version 2 of the License, or
798 + * (at your option) any later version.
799 + *
800 + * This program is distributed in the hope that it will be useful,
801 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
802 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
803 + * GNU General Public License for more details.
804 + *
805 + * You should have received a copy of the GNU General Public License along
806 + * with this program; if not, write to the Free Software Foundation, Inc.,
807 + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
808 + *
809 + * (C) Copyright 2004 Tom Parker
810 + * (C) Copyright 2004 Matthew Garrett
811 + * (C) Copyright 2004 Red Hat, Inc.
812 + */
813 +
814 +#ifdef HAVE_CONFIG_H
815 +#include <config.h>
816 +#endif
817 +
818 +#include <stdio.h>
819 +#include <string.h>
820 +#include <stdlib.h>
821 +
822 +#include "NetworkManagerGeneric.h"
823 +#include "nm-system.h"
824 +#include "NetworkManagerUtils.h"
825 +#include "nm-logging.h"
826 +
827 +/*
828 + * nm_system_enable_loopback
829 + *
830 + * Bring up the loopback interface
831 + *
832 + */
833 +void nm_system_enable_loopback (void)
834 +{
835 + /* No need to run localnet if it is already running */
836 + if (nm_spawn_process ("/etc/init.d/localnet status") != 0)
837 + nm_spawn_process("/etc/init.d/localnet start");
838 +}
839 +
840 +/*
841 + * nm_system_update_dns
842 + *
843 + * Make glibc/nscd aware of any changes to the resolv.conf file by
844 + * restarting nscd. Only restart if already running.
845 + *
846 + */
847 +void nm_system_update_dns (void)
848 +{
849 + if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) {
850 + nm_log_info (LOGD_DNS, "Clearing nscd hosts cache.");
851 + nm_spawn_process ("/usr/sbin/nscd -i hosts");
852 + }
853 +}
854 diff -Naur NetworkManager-0.8.1/src/dhcp-manager/nm-dhcp-dhclient.c NetworkManager-0.8.1-magellan/src/dhcp-manager/nm-dhcp-dhclient.c
855 --- NetworkManager-0.8.1/src/dhcp-manager/nm-dhcp-dhclient.c 2010-07-22 01:48:36.000000000 +0200
856 +++ NetworkManager-0.8.1-magellan/src/dhcp-manager/nm-dhcp-dhclient.c 2010-09-27 22:32:52.000000000 +0200
857 @@ -435,7 +435,7 @@
858
859 #if defined(TARGET_SUSE)
860 orig = g_strdup (SYSCONFDIR "/dhclient.conf");
861 -#elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO)
862 +#elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO) || defined(TARGET_MAGELLAN)
863 orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf");
864 #else
865 orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", iface);