Attachment #348086 for bug #440614




SYSCONFDIR=@SYSCONFDIR@
LIBEXECDIR=@LIBEXECDIR@
VARDIR=@VARDIR@

# set configuration defaults
dynamic_order="tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*"
interface_order="lo lo[0-9]*"
name_server_blacklist="0.0.0.0"
state_dir=""

# Support original resolvconf configuration layout
# as well as the openresolv config file
if [ -f "$SYSCONFDIR"/resolvconf.conf ]; then

METRICDIR="$VARDIR/metrics"
PRIVATEDIR="$VARDIR/private"

: ${dynamic_order:=tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*}
: ${interface_order:=lo lo[0-9]*}
: ${name_server_blacklist:=0.0.0.0}

error_exit()
{
	echo "$*" >&2
- 

Return to bug 440614

Lines 28-33 RESOLVCONF="$0" Link Here

(-)a/resolvconf.in (-5 / +7 lines)
28	SYSCONFDIR=@SYSCONFDIR@	28	SYSCONFDIR=@SYSCONFDIR@
29	LIBEXECDIR=@LIBEXECDIR@	29	LIBEXECDIR=@LIBEXECDIR@
30	VARDIR=@VARDIR@	30	VARDIR=@VARDIR@
		31
		32	# set configuration defaults
		33	dynamic_order="tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*"
		34	interface_order="lo lo[0-9]*"
		35	name_server_blacklist="0.0.0.0"
		36	state_dir=""
		37
31	# Support original resolvconf configuration layout	38	# Support original resolvconf configuration layout
32	# as well as the openresolv config file	39	# as well as the openresolv config file
33	if [ -f "$SYSCONFDIR"/resolvconf.conf ]; then	40	if [ -f "$SYSCONFDIR"/resolvconf.conf ]; then
Lines 43-52 IFACEDIR="$VARDIR/interfaces" Link Here
43	METRICDIR="$VARDIR/metrics"	50	METRICDIR="$VARDIR/metrics"
44	PRIVATEDIR="$VARDIR/private"	51	PRIVATEDIR="$VARDIR/private"
45		52
46	: ${dynamic_order:=tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*}
47	: ${interface_order:=lo lo[0-9]*}
48	: ${name_server_blacklist:=0.0.0.0}
49
50	error_exit()	53	error_exit()
51	{	54	{
52	echo "$*" >&2	55	echo "$*" >&2
53	-