Merge remote-tracking branch 'ms/cleanup' into next

src/initscripts/system/connectd

@@ -36,10 +36,6 @@ if [ ! $HOLDOFF ]; then
 	HOLDOFF=30
 fi
 
-if [ "$RECONNECTION" = "dialondemand" ]; then
-	exit 0
-fi
-
 msg_log () {
 	logger -t $(basename $0)[$$] $*
 }

src/initscripts/system/functions

@@ -512,7 +512,7 @@ loadproc()
 		esac
 	fi
 
-	local cmd="${@}"
+	local cmd=( "${@}" )
 
 	if [ -n "${nicelevel}" ]; then
 		cmd="nice -n "${nicelevel}" ${cmd}"
@@ -520,13 +520,12 @@ loadproc()
 
 	if [ -n "${background}" ]; then
 		(
-			${cmd} &>/dev/null
+			${cmd[@]} &>/dev/null
 		) &
 		pid="$!"
 		evaluate_retval
 	else
-		${cmd}
-		pid="$!"
+		${cmd[@]}
 		evaluate_retval # This is "Probably" not LSB compliant, but required to be compatible with older bootscripts
 	fi