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

(-)a/ppp-common/ppp/ip-down (+3 lines)
Lines 14-19 Link Here
14
14
15
LOGDEVICE=$6
15
LOGDEVICE=$6
16
REALDEVICE=$1
16
REALDEVICE=$1
17
RESOLVCONF=/sbin/resolvconf
17
18
18
export PATH=/sbin:/usr/sbin:/bin:/usr/bin
19
export PATH=/sbin:/usr/sbin:/bin:/usr/bin
19
20
Lines 22-27 if [ -f /etc/resolv.conf.save.$REALDEVICE ]; then Link Here
22
	rm -f /etc/resolv.conf.save.$REALDEVICE
23
	rm -f /etc/resolv.conf.save.$REALDEVICE
23
	UC=/usr/sbin/update_chrooted
24
	UC=/usr/sbin/update_chrooted
24
	[ -x $UC ] && $UC conf
25
	[ -x $UC ] && $UC conf
26
else
27
	[ -x "$RESOLVCONF" ] && $RESOLVCONF -fd $REALDEVICE
25
fi
28
fi
26
29
27
for f in /etc/ppp/ip-down.d/*; do
30
for f in /etc/ppp/ip-down.d/*; do
(-)a/ppp-common/ppp/ip-up (-6 / +10 lines)
Lines 31-36 LOGDEVICE=$6 Link Here
31
REALDEVICE=$1
31
REALDEVICE=$1
32
NS_IFUP=/etc/sysconfig/network-scripts/ifup-post
32
NS_IFUP=/etc/sysconfig/network-scripts/ifup-post
33
N_C_S_CONFIG=/etc/sysconfig/network
33
N_C_S_CONFIG=/etc/sysconfig/network
34
RESOLVCONF=/sbin/resolvconf
35
PPP_RESOLV_CONF=/etc/ppp/resolv.conf
34
36
35
export PATH=/sbin:/usr/sbin:/bin:/usr/bin
37
export PATH=/sbin:/usr/sbin:/bin:/usr/bin
36
38
Lines 116-128 modify_resolver() Link Here
116
}
118
}
117
119
118
if ! is_no "$RESOLV_MODS"; then
120
if ! is_no "$RESOLV_MODS"; then
119
	# check if kppp was here, don't touch /etc/resolv.conf then, just UC
121
	if [ -x "$RESOLVCONF" ]; then
120
	grep -iqs '#.*ppp temp entry' /etc/resolv.conf || modify_resolver
122
		[ -f "$PPP_RESOLV_CONF" ] && $RESOLVCONF -a $REALDEVICE <$PPP_RESOLV_CONF
123
	else
124
		# check if kppp was here, don't touch /etc/resolv.conf then, just UC
125
		grep -iqs '#.*ppp temp entry' /etc/resolv.conf || modify_resolver
126
		UC=/usr/sbin/update_chrooted
127
		[ -x $UC ] && $UC conf
128
	fi
121
fi
129
fi
122
130
123
UC=/usr/sbin/update_chrooted
124
[ -x $UC ] && $UC conf
125
126
case $CONFMETHOD in
131
case $CONFMETHOD in
127
	etcnet)
132
	etcnet)
128
# Do nothing. /etc/net relies on updetach pppd option to continue configuring
133
# Do nothing. /etc/net relies on updetach pppd option to continue configuring
129
- 

Return to bug 19635