Removing any reference to $NET

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

1 files changed, 1 insertions, 113 deletions

diff --git a/sbin/rc-services.sh b/sbin/rc-services.sh
index 7ead024..c0ffe1d 100755
--- a/sbin/rc-services.sh
+++ b/sbin/rc-services.sh
@@ -613,51 +613,6 @@ service_failed() {
 	[[ -n $1 && -L "${svcdir}/failed/$1" ]]
 }
 
-# bool net_service(service)
-#
-#   Returns true if 'service' is a service controlling a network interface
-#
-net_service() {
-	[[ -n $1 && ${1%%.*} == "net" && ${1##*.} != $1 ]]
-}
-
-# bool is_net_up()
-#
-#    Return true if service 'net' is considered up, else false.
-#
-#    Notes for RC_NET_STRICT_CHECKING values:
-#      none  net is up without checking anything - usefull for vservers
-#      lo    Interface 'lo' is counted and if only it is up, net is up.
-#      no    Interface 'lo' is not counted, and net is down even with it up,
-#            so there have to be at least one other interface up.
-#      yes   All interfaces must be up.
-is_net_up() {
-	local netcount=0
-
-	case "${RC_NET_STRICT_CHECKING}" in
-		none)
-			return 0
-			;;
-		lo)
-			netcount="$(ls -1 "${svcdir}"/started/net.* 2> /dev/null | \
-			            egrep -c "\/net\..*$")"
-			;;
-		*)
-			netcount="$(ls -1 "${svcdir}"/started/net.* 2> /dev/null | \
-			            grep -v 'net\.lo' | egrep -c "\/net\..*$")"
-			;;
-	esac
-
-	# Only worry about net.* services if this is the last one running,
-	# or if RC_NET_STRICT_CHECKING is set ...
-	if [ "${netcount}" -lt 1 -o "${RC_NET_STRICT_CHECKING}" = "yes" ]
-	then
-		return 1
-	fi
-
-	return 0
-}
-
 # bool dependon(service1, service2)
 #
 #   Does service1 depend (NEED or USE) on service2 ?
@@ -684,7 +639,6 @@ valid_i() {
 	do
 		[[ -e "/etc/runlevels/${BOOTLEVEL}/${x}" \
 			|| -e "/etc/runlevels/${mylevel}/${x}" \
-			|| ${x} == "net" ]] \
 				&& echo "${x}"
 	done
 
@@ -719,18 +673,7 @@ trace_dependencies() {
 
 	if [[ $1 == -* ]]; then
 		deptype="${1/-}"
-		if net_service "${myservice}" ; then
-			services=( "net" "${myservice}" )
-		else
-			services=( "${myservice}" )
-		fi
-	fi
-
-	# If its a net service, just replace it with 'net'
-	if [[ -z ${deptype} ]] ; then
-		for (( i=0; i<${#services[@]} ; i++ )) ; do
-			net_service "${services[i]}" && services[i]="net"
-		done
+		services=( "${myservice}" )
 	fi
 
 	sort_unique() {
@@ -754,11 +697,6 @@ trace_dependencies() {
 					ndeps=( "${ndeps[@]}" $( valid_iafter "${services[i]}" ) )
 				fi
 
-				#If its a net service, just replace it with 'net'
-				for (( j=0; j<${#ndeps[*]}; j++ )) ; do
-					net_service "${ndeps[j]}" && ndeps[j]="net"
-				done
-
 				deps=( "${deps[@]}" "${ndeps[@]}" )
 			fi
 		done
@@ -790,13 +728,6 @@ trace_dependencies() {
 			deps="${deps} $( valid_iafter ${service} )"
 		fi
 
-		if [[ -z ${deptype} ]] ; then
-			# If its a net service, just replace it with 'net'
-			for (( j=0; j<${#deps[@]}; j++ )) ; do
-				net_service "${deps[j]}" && deps[j]="net"
-			done
-		fi
-
 		for x in ${deps}; do
 			after_visit "${x}"
 		done
@@ -813,43 +744,6 @@ trace_dependencies() {
 		# If deptype is set, we do not want the name of this service
 		x=" ${services[@]} "
 		services=( ${x// ${myservice} / } )
-
-		# If its a net service, do not include "net"
-		if net_service "${myservice}" ; then
-			x=" ${services[@]} "
-			sorted=( ${services// net / } )
-		fi
-	else
-		local netserv y
-
-		# XXX:  I dont think RC_NET_STRICT_CHECKING should be considered
-		#       here, but you never know ...
-		netserv=$( cd "${svcdir}"/started; ls net.* 2>/dev/null )
-
-		get_netservices() {
-			local runlevel="$1"
-
-			if [[ -d "/etc/runlevels/${runlevel}" ]] ; then
-				cd "/etc/runlevels/${runlevel}"
-				ls net.* 2>/dev/null
-			fi
-		}
-
-		# If no net services are running or we only have net.lo up, then
-		# assume we are in boot runlevel or starting a new runlevel
-		if [[ -z ${netserv} || ${netserv} == "net.lo" ]]; then
-			local mylevel="${BOOTLEVEL}"
-			local startnetserv=$( get_netservices "${mylevel}" )
-
-			[[ -f "${svcdir}/softlevel" ]] && mylevel=$( < "${svcdir}/softlevel" )
-			[[ ${BOOTLEVEL} != ${mylevel} ]] && \
-			startnetserv="${startnetserv} $( get_netservices "${mylevel}" )"
-			[[ -n ${startnetserv} ]] && netserv="${startnetserv}"
-		fi
-
-		# Replace 'net' with the actual net services
-		x=" ${services[@]} "
-		services=( ${x// net / ${netserv} } )
 	fi
 
 	echo "${services[@]}"
@@ -862,19 +756,13 @@ trace_dependencies() {
 #
 query_before() {
 	local x list
-	local netservice="no"
 
 	[[ -z $1 || -z $2 ]] && return 1
 
 	list=$( trace_dependencies "$1" )
 
-	net_service "$2" && netservice="yes"
-	
 	for x in ${list} ; do
 		[[ ${x} == "$2" ]] && return 0
-
-		# Also match "net" if this is a network service ...
-		[[ ${netservice} == "yes" && ${x} == "net" ]] && return 0
 	done
 
 	return 1