summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2012-11-12 20:01:31 +0100
committerJouke Witteveen <j.witteveen@gmail.com>2012-11-12 20:01:31 +0100
commitf7d5875956b0a2c72f8f0a55263906ee4f838cac (patch)
tree1a27b283a6ec47975a74ed48b1d281c3e4c313b1
parent75359ecb9dc01dc5f2486e13c792a85c3807cfb1 (diff)
downloadnetctl-f7d5875956b0a2c72f8f0a55263906ee4f838cac.tar.gz
netctl-f7d5875956b0a2c72f8f0a55263906ee4f838cac.tar.xz
Fix support for "options" in /etc/resolv.conf (FS#32601)
This is an errata to f1598, in which I introduced an error.
-rw-r--r--src/connections/ethernet2
-rw-r--r--src/connections/openvpn2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/connections/ethernet b/src/connections/ethernet
index a6a53bd..487adf8 100644
--- a/src/connections/ethernet
+++ b/src/connections/ethernet
@@ -219,7 +219,7 @@ ethernet_up() {
echo "nameserver $dns" >>/etc/resolv.conf
done
for dnsoption in "${DNS_OPTIONS[@]}"; do
- echo "option $dnsoption" >>/etc/resolv.conf
+ echo "options $dnsoption" >>/etc/resolv.conf
done
fi
diff --git a/src/connections/openvpn b/src/connections/openvpn
index 6ecfeb7..170d582 100644
--- a/src/connections/openvpn
+++ b/src/connections/openvpn
@@ -29,7 +29,7 @@ openvpn_up() {
echo "nameserver $dns" >>/etc/resolv.conf
done
for dnsoption in "${DNS_OPTIONS[@]}"; do
- echo "option $dnsoption" >>/etc/resolv.conf
+ echo "options $dnsoption" >>/etc/resolv.conf
done
fi
}