Merge branch 'master' of git://projects.archlinux.org/initscripts2012.05.2

Conflicts:
	Makefile

1 files changed, 4 insertions, 4 deletions

diff --git a/network b/network
index d22b5dd..322082c 100755
--- a/network
+++ b/network
@@ -19,7 +19,7 @@ need_legacy() {
 
 deprecated() {
 	printf "${C_FAIL}Warning:${C_CLEAR} Your network settings are deprecated.\n"
-	printf "  Please refer to /etc/rc.conf on how to define a single wired\n"
+	printf "  Please refer to 'man 5 rc.conf' on how to define a single wired\n"
 	printf "  connection, or use a utility such as netcfg.\n"
 }
 
@@ -52,7 +52,7 @@ network_down() {
 	have_interface "$interface" || return 1
 
 	if [[ -f /run/dhcpcd-$interface.pid ]]; then
-		dhcpcd -k $interface || return 1
+		dhcpcd -qk $interface || return 1
 	else
 		ip addr flush dev $interface || return 1
 	fi
@@ -260,7 +260,7 @@ case "$1" in
 		else
 			network_up
 		fi
-		if ((error == 0)); then
+		if (( ! error )); then
 			add_daemon network
 			stat_done
 		else
@@ -296,7 +296,7 @@ case "$1" in
 		else
 			network_down
 		fi
-		if ((error == 0)); then
+		if (( ! error )); then
 			stat_done
 		else
 			stat_fail