Allow unsetting of vars
authorRoy Marples <roy@marples.name>
Sun, 19 Oct 2014 23:31:23 +0000 (23:31 +0000)
committerRoy Marples <roy@marples.name>
Sun, 19 Oct 2014 23:31:23 +0000 (23:31 +0000)
resolvconf.in

index 0ca86d31d61867d462566be5bd224689c8ef0d3c..b3f31121d3255052bbe9f814993573563d4f54a2 100644 (file)
@@ -32,6 +32,11 @@ VARDIR=@VARDIR@
 # Disregard dhcpcd setting
 unset interface_order state_dir
 
 # Disregard dhcpcd setting
 unset interface_order state_dir
 
+local_nameservers="127.* 0.0.0.0 255.255.255.255 ::1"
+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"
+
 # Support original resolvconf configuration layout
 # as well as the openresolv config file
 if [ -f "$SYSCONFDIR"/resolvconf.conf ]; then
 # Support original resolvconf configuration layout
 # as well as the openresolv config file
 if [ -f "$SYSCONFDIR"/resolvconf.conf ]; then
@@ -49,11 +54,6 @@ METRICDIR="$VARDIR/metrics"
 PRIVATEDIR="$VARDIR/private"
 LOCKDIR="$VARDIR/lock"
 
 PRIVATEDIR="$VARDIR/private"
 LOCKDIR="$VARDIR/lock"
 
-: ${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}
-: ${local_nameservers:=127.* 0.0.0.0 255.255.255.255 ::1}
-
 warn()
 {
        echo "$*" >&2
 warn()
 {
        echo "$*" >&2