Index: arping =================================================================== --- arping (revision 1614) +++ arping (working copy) @@ -87,6 +87,11 @@ eoutdent veinfo "Configuring ${iface} for ${x}" configure_variables "${iface}" "${conf}" + + # Call the system module as we've aleady passed it by .... + # And it *has* to be pre_start for other things to work correctly + system_pre_start "${iface}" + eval config=( \"\$\{config_${ifvar}\[@\]\}\" ) eval fallback_config=( \"\$\{fallback_config_${ifvar}\[@\]\}\" ) eval fallback_route=( \"\$\{fallback_route_${ifvar}\[@\]\}\" ) Index: system =================================================================== --- system (revision 1614) +++ system (working copy) @@ -6,7 +6,8 @@ # # Sets up the dependancies for the module system_depend() { - after interface dhcp + after interface + before dhcp variables dns_servers dns_domain dns_options dns_search dns_sortlist \ ntp_servers nis_domain nis_servers } @@ -122,7 +123,7 @@ # # Configures the host system for dns, ntp and nis information # Always returns 0 -system_post_start() { +system_pre_start() { local iface="$1" system_dns "${iface}" Index: helpers.d/pppd-wrapper =================================================================== --- helpers.d/pppd-wrapper (revision 0) +++ helpers.d/pppd-wrapper (revision 0) @@ -0,0 +1,18 @@ +#!/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 Property changes on: helpers.d/pppd-wrapper ___________________________________________________________________ Name: svn:executable + * Index: helpers.d/functions =================================================================== --- helpers.d/functions (revision 1614) +++ helpers.d/functions (working copy) @@ -151,7 +151,7 @@ opts[i]=$( sed -n -e 's/^[ \t]*options[ \t]*\([^#]*\).*/\1#/p;' "${f}" | xargs ) sortlist[i]=$( sed -n -e 's/^[ \t]*sortlist[ \t]*\([^#]*\).*/\1/p' "${f}" ) - if [[ -z ${srvs[i]} && -z ${opts[i]} && -z ${sortlist[i]} ]]; then + if [[ -z ${srvs[i]} && -z ${opts[i]} && -z ${sortlist[i]} && -z ${search[i]} ]]; then unset srvs[i] unset search[i] unset opts[i]