summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2013-07-12 22:20:38 +0200
committerJouke Witteveen <j.witteveen@gmail.com>2013-07-12 22:20:38 +0200
commitccff4c94718d8bc1d439c1a6e69fcd03b319c8c1 (patch)
treed59744f94e99bf43720de3d65da03eb91595aa6d
parentfeb669f4b2a15e6ea1d84be336f12be4650f9d2d (diff)
downloadnetctl-ccff4c94718d8bc1d439c1a6e69fcd03b319c8c1.tar.gz
netctl-ccff4c94718d8bc1d439c1a6e69fcd03b319c8c1.tar.xz
Style fixes
Redirect syntax and a modeline.
-rwxr-xr-xsrc/ifplugd.action5
-rw-r--r--src/lib/ip2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ifplugd.action b/src/ifplugd.action
index 617902f..c87ac0c 100755
--- a/src/ifplugd.action
+++ b/src/ifplugd.action
@@ -51,8 +51,11 @@ case "$2" in
fi
;;
*)
- echo "Wrong arguments" > /dev/stderr
+ echo "Wrong arguments" >&2
;;
esac
exit 1
+
+
+# vim: ft=sh ts=4 et sw=4:
diff --git a/src/lib/ip b/src/lib/ip
index e0629ec..e144ee3 100644
--- a/src/lib/ip
+++ b/src/lib/ip
@@ -48,7 +48,7 @@ ip_set() {
rm -f "/run/dhcpcd-$Interface".{pid,cache}
# If using own dns, tell dhcpcd to NOT replace resolv.conf
[[ $DNS ]] && DhcpcdOptions+=" -C resolv.conf"
- do_debug dhcpcd -4qL -t "${TimeoutDHCP:-10}" $DhcpcdOptions "$Interface" 2>&1 | report_debug "$(cat)"
+ do_debug dhcpcd -4qL -t "${TimeoutDHCP:-10}" $DhcpcdOptions "$Interface" |& report_debug "$(cat)"
# The first array value of PIPESTATUS is the exit status of dhcpcd
if (( PIPESTATUS != 0 )); then
report_error "DHCP IP lease attempt failed on interface '$Interface'"