From 75187169a35b4fcd899d04a4860a9aad64d6c518 Mon Sep 17 00:00:00 2001 From: Jim Pryor Date: Tue, 11 Aug 2009 08:04:56 -0400 Subject: ethernet_up will create resolv.conf also for $DNS Signed-off-by: Jim Pryor --- src/connections/ethernet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/connections/ethernet b/src/connections/ethernet index 0e72ad3..61e3960 100644 --- a/src/connections/ethernet +++ b/src/connections/ethernet @@ -48,7 +48,7 @@ ethernet_up() { # Clear remaining pid files. rm -f /var/run/dhcpcd-${INTERFACE}.{pid,cache} >/dev/null 2>&1 # If using own dns, tell dhcpcd to NOT replace resolv.conf - [[ -n "$DNS1" ]] && DHCP_OPTIONS="-C resolv.conf $DHCP_OPTIONS" + [[ -n "$DNS1" || -n "$DNS" ]] && DHCP_OPTIONS="-C resolv.conf $DHCP_OPTIONS" # Start dhcpcd report_debug ethernet_up dhcpcd -qL -t "${DHCP_TIMEOUT:-10}" $DHCP_OPTIONS "$INTERFACE" if ! dhcpcd -qL -t "${DHCP_TIMEOUT:-10}" $DHCP_OPTIONS "$INTERFACE"; then -- cgit v1.2.3-24-g4f1b