Merging r2079

svn path=/baselayout-vserver/trunk/; revision=372

3 files changed, 11 insertions, 5 deletions

diff --git a/sbin/depscan.sh b/sbin/depscan.sh
index d0cff4a..7ca6fe2 100755
--- a/sbin/depscan.sh
+++ b/sbin/depscan.sh
@@ -89,13 +89,17 @@ if ! ${update} ; then
 	fi
 
 	touch "${mtime_test}"
-	for config in /etc/conf.d /etc/init.d /etc/rc.conf
+	for config in /etc/conf.d/* /etc/init.d/* /etc/rc.conf
 	do
 		! ${update} \
 			&& is_older_than "${mysvcdir}/depcache" "${config}" \
 			&& update=true
 		
-		is_older_than "${mtime_test}" "${config}" && clock_screw=1
+		if is_older_than "${mtime_test}" "${config}" ; then
+			# Update the file modification time
+			touch "${config}" &>/dev/null
+			clock_screw=1
+		fi
 	done
 	rm -f "${mtime_test}"
 
diff --git a/sbin/rc b/sbin/rc
index 368deeb..2285ce4 100755
--- a/sbin/rc
+++ b/sbin/rc
@@ -185,9 +185,11 @@ dep_stop() {
 	if [[ ${SOFTLEVEL} != "reboot" \
 		  && ${SOFTLEVEL} != "shutdown" ]] ; then
 			service_coldplugged "${service}" && return 0
-		[[ -z ${OLDSOFTLEVEL} ]] \
+		if net_service "${service}" ; then
+			[[ -z ${OLDSOFTLEVEL} ]] \
 			|| ! in_runlevel "${service}" "${OLDSOFTLEVEL}" \
-			&& return 0
+				&& return 0
+		fi
 	fi
 
 	# Should not work for 'use'
diff --git a/sbin/rc-update b/sbin/rc-update
index 28bf91e..82120cf 100755
--- a/sbin/rc-update
+++ b/sbin/rc-update
@@ -229,7 +229,7 @@ done
 
 if [[ -z ${action} ]] ; then
 	eerror "${argv0}: gimme something to do!" 1>&2
-	exit 1
+	usage 1
 fi
 
 [[ ${check_root} -eq 1 ]] && check_is_root