View | Details | Raw Unified | Return to bug 13773
Collapse All | Expand All

(-)/etc/ppp/ip-up.orig (-10 / +11 lines)
Lines 54-59 Link Here
54
. /etc/init.d/functions
54
. /etc/init.d/functions
55
SourceIfNotEmpty $N_C_S_CONFIG
55
SourceIfNotEmpty $N_C_S_CONFIG
56
56
57
update_chrooted_conf()
58
{
59
	local UC=/usr/sbin/update_chrooted
60
	[ -x $UC ] && $UC conf
61
}
62
57
# taken from net-scripts
63
# taken from net-scripts
58
modify_resolver()
64
modify_resolver()
59
{
65
{
Lines 112-131 Link Here
112
		cat $tr > /etc/resolv.conf
118
		cat $tr > /etc/resolv.conf
113
		rm -f $tr
119
		rm -f $tr
114
		umask $oldumask
120
		umask $oldumask
115
		local UC=/usr/sbin/update_chrooted
121
		update_chrooted_conf
116
		[ -x $UC ] && $UC conf
117
	fi
122
	fi
118
}
123
}
119
124
120
if ! is_no "$RESOLV_MODS"; then
125
if ! is_no "$RESOLV_MODS"; then
121
	# for dynamic DNS support with gnome-ppp and kppp and draknet (adsl)
126
	# check if kppp was here, don't touch /etc/resolv.conf then, just UC
122
	if grep -iqs '#.*ppp temp entry' /etc/resolv.conf; then
127
	grep -iqs '#.*ppp temp entry' /etc/resolv.conf \
123
		PPP_TEMP_ENTRY=`grep '#.*ppp temp entry' /etc/resolv.conf | \
128
	&& update_chrooted_conf \
124
		tail -1 | sed 's/.*ppp temp entry/# ppp temp entry/' `
129
	|| modify_resolver
125
	else
126
		unset PPP_TEMP_ENTRY
127
	fi
128
	[ -n "$PPP_TEMP_ENTRY" ] && modify_resolver
129
fi
130
fi
130
131
131
case $CONFMETHOD in
132
case $CONFMETHOD in

Return to bug 13773