Attachment 2334 Details for Bug 13773 – do update_chrooted conf even if we don't update resolv.conf ourselves

[patch] do update_chrooted conf even if we don't update resolv.conf ourselves

ip-up.patch2 (text/plain), 1.04 KB, created by Michael Shigorin on 2007-12-24 16:27:37 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Shigorin

Created: 2007-12-24 16:27:37 MSK

Size: 1.04 KB

patch

obsolete

>--- /etc/ppp/ip-up.orig	2005-09-25 23:56:18 +0400
>+++ /etc/ppp/ip-up	2007-12-24 15:57:09 +0300
>@@ -54,6 +54,12 @@
> . /etc/init.d/functions
> SourceIfNotEmpty $N_C_S_CONFIG
> 
>+update_chrooted_conf()
>+{
>+	local UC=/usr/sbin/update_chrooted
>+	[ -x $UC ] && $UC conf
>+}
>+
> # taken from net-scripts
> modify_resolver()
> {
>@@ -112,20 +118,15 @@
> 		cat $tr > /etc/resolv.conf
> 		rm -f $tr
> 		umask $oldumask
>-		local UC=/usr/sbin/update_chrooted
>-		[ -x $UC ] && $UC conf
>+		update_chrooted_conf
> 	fi
> }
> 
> if ! is_no "$RESOLV_MODS"; then
>-	# for dynamic DNS support with gnome-ppp and kppp and draknet (adsl)
>-	if grep -iqs '#.*ppp temp entry' /etc/resolv.conf; then
>-		PPP_TEMP_ENTRY=`grep '#.*ppp temp entry' /etc/resolv.conf | \
>-		tail -1 | sed 's/.*ppp temp entry/# ppp temp entry/' `
>-	else
>-		unset PPP_TEMP_ENTRY
>-	fi
>-	[ -n "$PPP_TEMP_ENTRY" ] && modify_resolver
>+	# check if kppp was here, don't touch /etc/resolv.conf then, just UC
>+	grep -iqs '#.*ppp temp entry' /etc/resolv.conf \
>+	&& update_chrooted_conf \
>+	|| modify_resolver
> fi
> 
> case $CONFMETHOD in

Actions: View | Diff

Attachments on bug 13773: 2333 | 2334