Attachment #72645 for bug #112049

Lines 87-92 Link Here

(-)arping (+5 lines)
87	eoutdent	87	eoutdent
88	veinfo "Configuring ${iface} for ${x}"	88	veinfo "Configuring ${iface} for ${x}"
89	configure_variables "${iface}" "${conf}"	89	configure_variables "${iface}" "${conf}"
		90
		91	# Call the system module as we've aleady passed it by ....
		92	# And it has to be pre_start for other things to work correctly
		93	system_pre_start "${iface}"
		94
90	eval config=( \"\$\{config_${ifvar}\[@\]\}\" )	95	eval config=( \"\$\{config_${ifvar}\[@\]\}\" )
91	eval fallback_config=( \"\$\{fallback_config_${ifvar}\[@\]\}\" )	96	eval fallback_config=( \"\$\{fallback_config_${ifvar}\[@\]\}\" )
92	eval fallback_route=( \"\$\{fallback_route_${ifvar}\[@\]\}\" )	97	eval fallback_route=( \"\$\{fallback_route_${ifvar}\[@\]\}\" )

Lines 6-12 Link Here

(-)system (-2 / +3 lines)
6	#	6	#
7	# Sets up the dependancies for the module	7	# Sets up the dependancies for the module
8	system_depend() {	8	system_depend() {
9	after interface dhcp	9	after interface
		10	before dhcp
10	variables dns_servers dns_domain dns_options dns_search dns_sortlist \	11	variables dns_servers dns_domain dns_options dns_search dns_sortlist \
11	ntp_servers nis_domain nis_servers	12	ntp_servers nis_domain nis_servers
12	}	13	}
Lines 122-128 Link Here
122	#	123	#
123	# Configures the host system for dns, ntp and nis information	124	# Configures the host system for dns, ntp and nis information
124	# Always returns 0	125	# Always returns 0
125	system_post_start() {	126	system_pre_start() {
126	local iface="$1"	127	local iface="$1"
127		128
128	system_dns "${iface}"	129	system_dns "${iface}"




#!/bin/bash
# Copyright (c) 2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

# Contributed by Roy Marples (uberlord@gentoo.org)

action="$1"
interface="$2"

if [[ ${action} == "up" ]]; then
	. /lib/rcscripts/net.modules.d/helpers.d/module-loader
	resolv="${statedir}/${interface}/resolv.conf"
	system_dns "${interface}" "${resolv}"
fi

. /lib/rcscripts/net.modules.d/helpers.d/dhcp-state

# vim:ts=4
  + *

Lines 151-157 Link Here

(-)helpers.d/functions (-1 / +1 lines)
151	opts[i]=$( sed -n -e 's/^[ \t]options[ \t]$[^#]$./\1#/p;' "${f}" \| xargs )	151	opts[i]=$( sed -n -e 's/^[ \t]options[ \t]$[^#]$./\1#/p;' "${f}" \| xargs )
152	sortlist[i]=$( sed -n -e 's/^[ \t]sortlist[ \t]$[^#]$./\1/p' "${f}" )	152	sortlist[i]=$( sed -n -e 's/^[ \t]sortlist[ \t]$[^#]$./\1/p' "${f}" )
153		153
154	if [[ -z ${srvs[i]} && -z ${opts[i]} && -z ${sortlist[i]} ]]; then	154	if [[ -z ${srvs[i]} && -z ${opts[i]} && -z ${sortlist[i]} && -z ${search[i]} ]]; then
155	unset srvs[i]	155	unset srvs[i]
156	unset search[i]	156	unset search[i]
157	unset opts[i]	157	unset opts[i]

Return to bug 112049

Line 0 Link Here

(-)helpers.d/pppd-wrapper (+18 lines)
		1	#!/bin/bash
		2	# Copyright (c) 2005 Gentoo Foundation
		3	# Distributed under the terms of the GNU General Public License v2
		4
		5	# Contributed by Roy Marples (uberlord@gentoo.org)
		6
		7	action="$1"
		8	interface="$2"
		9
		10	if [[ ${action} == "up" ]]; then
		11	. /lib/rcscripts/net.modules.d/helpers.d/module-loader
		12	resolv="${statedir}/${interface}/resolv.conf"
		13	system_dns "${interface}" "${resolv}"
		14	fi
		15
		16	. /lib/rcscripts/net.modules.d/helpers.d/dhcp-state
		17
		18	# vim:ts=4
0	+ *	19	+ *