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

Conflicts:
	Makefile

1 files changed, 4 insertions, 5 deletions

diff --git a/rc.d b/rc.d
index aed2e42..0cfbdaf 100755
--- a/rc.d
+++ b/rc.d
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-NEED_ROOT=0 # this script can be run without be root
 . /etc/rc.conf
 . /etc/rc.d/functions
 
@@ -41,10 +40,10 @@ not exist or is not executable.${C_CLEAR}\n" >&2
 			exit 2
 		fi
 		# check filter
-		((${filter[started]} == 1)) && ck_daemon "$daemon" && continue
-		((${filter[stopped]} == 1)) && ! ck_daemon "$daemon" && continue
-		((${filter[auto]} == 1)) && ck_autostart "$daemon" && continue
-		((${filter[noauto]} == 1)) && ! ck_autostart "$daemon" && continue
+		(( ${filter[started]} )) && ck_daemon "$daemon" && continue
+		(( ${filter[stopped]} )) && ! ck_daemon "$daemon" && continue
+		(( ${filter[auto]} )) && ck_autostart "$daemon" && continue
+		(( ${filter[noauto]} )) && ! ck_autostart "$daemon" && continue
 		new_daemons+=("$daemon")
 	done
 	daemons=("${new_daemons[@]}")