diff options
| author | Jim Pryor <profjim@jimpryor.net> | 2009-08-11 14:04:56 +0200 |
|---|---|---|
| committer | James Rayner <james@archlinux.org> | 2009-08-15 04:28:26 +0200 |
| commit | 75187169a35b4fcd899d04a4860a9aad64d6c518 (patch) | |
| tree | e3153885601f2c70b776d77f64bd9ac559e1f272 /src/connections | |
| parent | 42be8db00c4255de6cccfa8ff1250119d7486730 (diff) | |
| download | netctl-75187169a35b4fcd899d04a4860a9aad64d6c518.tar.gz netctl-75187169a35b4fcd899d04a4860a9aad64d6c518.tar.xz | |
ethernet_up will create resolv.conf also for $DNS
Signed-off-by: Jim Pryor <profjim@jimpryor.net>
Diffstat (limited to 'src/connections')
| -rw-r--r-- | src/connections/ethernet | 2 |
1 files changed, 1 insertions, 1 deletions
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 |