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

Conflicts:
	Makefile

1 files changed, 3 insertions, 3 deletions

diff --git a/arch-sysctl b/arch-sysctl
index 4856df6..f73f1f0 100755
--- a/arch-sysctl
+++ b/arch-sysctl
@@ -18,12 +18,12 @@ declare -A fragments
 
 # files declared later in the sysctl_d array will override earlier
 # Example: `/etc/sysctl.d/foo.conf' supersedes `/usr/lib/sysctl.d/foo.conf'.
-for path in "${sysctl_d[@]}"; do
-  [[ -f $path ]] && fragments[${path##*/}]=$path
+for path in "${@:-${sysctl_d[@]}}"; do
+	[[ -f $path ]] && fragments[${path##*/}]=$path
 done
 
 for path in "${fragments[@]}"; do
-	sysctl -q -p "$path"
+	sysctl -q -p"$path"
 done
 
 # vim: set ts=2 sw=2 noet: