--- branches/magellan-next/include/mtools.minc	2011/06/02 18:16:14	18
+++ branches/magellan-next/include/mtools.minc	2011/06/02 21:21:16	19
@@ -14,7 +14,16 @@
 		return
 	fi
 
-	[[ -z ${service_exec} ]] && service_exec="$(which ${service})"
+	if [[ -z ${service_exec} ]]
+	then
+		case ${service} in
+			*.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
+			*.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
+			*.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
+			*.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
+			*) service_exec="$(which ${service} 2> /dev/null)" ;;
+		esac
+	fi
 
 	# add service to default runlevels
 	echo -e " ${COLBLUE}[${COLGREEN}+${COLBLUE}]${COLDEFAULT} adding ${service} to default runlevels ..."
@@ -49,7 +58,16 @@
 		return
 	fi
 
-	[[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"
+	if [[ -z ${service_exec} ]]
+	then
+		case ${service} in
+			*.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
+			*.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
+			*.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
+			*.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
+			*) service_exec="$(which ${service} 2> /dev/null)" ;;
+		esac
+	fi
 
 	# only stop the service if ${service_exec} does not exist
 	[[ -f ${MROOT}/${service_exec} ]] && return
@@ -85,7 +103,16 @@
 		return
 	fi
 
-	[[ -z ${service_exec} ]] && service_exec="$(which ${service} 2> /dev/null)"
+	if [[ -z ${service_exec} ]]
+	then
+		case ${service} in
+			*.service) service_exec="$(which ${service%%.service} 2> /dev/null)" ;;
+			*.socket) service_exec="$(which ${service%%.socket} 2> /dev/null)" ;;
+			*.mount) service_exec="$(which ${service%%.mount} 2> /dev/null)" ;;
+			*.target) service_exec="$(which ${service%%.target} 2> /dev/null)" ;;
+			*) service_exec="$(which ${service} 2> /dev/null)" ;;
+		esac
+	fi
 
 	# do not stop services on bootstrap or MROOT!=/
 	if [[ ${MAGE_BOOTSTRAP} != true ]] && [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]