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