diff --git a/etc/init/autofs-nis.conf b/etc/init/autofs-nis.conf
index 7a51710..3cfdce9 100644
--- a/etc/init/autofs-nis.conf
+++ b/etc/init/autofs-nis.conf
@@ -11,18 +11,7 @@ console output
 pre-start script
 	source /etc/init/functions
 	if grep automount /etc/nsswitch.conf|grep -q nis; then
-		if [ -f /var/run/autofs/automount_nis.pid ]; then
-			if ps -ef|\
-			   grep automount |\
-			   grep nis |\
-			   awk '{print $2}'|\
-			   grep -q `cat /var/run/autofs/automount_nis.pid`; then
-				echo -n "Automount already running"
-				exit 10
-			else
-				rm /var/run/autofs/automount_nis.pid
-			fi
-		fi
+		/sbin/CheckPid /var/run/autofs/automount_nis.pid
 	else
 		exit 10
 	fi
diff --git a/etc/init/autofs.conf b/etc/init/autofs.conf
index ef63de1..acd3b25 100644
--- a/etc/init/autofs.conf
+++ b/etc/init/autofs.conf
@@ -11,19 +11,7 @@ console none
 pre-start script
 	source /etc/init/functions
 	if [ -f /etc/sysconfig/auto.master ] && grep automount /etc/nsswitch.conf|grep -q files; then
-		if [ -f /var/run/autofs/automount_files.pid  ]; then
-			if ps -ef|\
-			   grep automount |\
-			   grep nis |\
-			   awk '{print $2}'|\
-			   grep -q `cat /var/run/autofs/automount_files.pid`; then
-				echo "Automount already running - not started"
-				exit 10
-			else
-				echo -n "Removing old files"
-				rm /var/run/autofs/automount_files.pid
-			fi
-		fi
+		CheckPid /var/run/autofs/automount_files.pid
 	else
 		exit 10
 	fi