[ptpd/el6] fixes

jondkent jondkent at fedoraproject.org
Tue Jun 17 19:37:02 UTC 2014


commit d27943ee05efd64f75802f6b905452a0cbbce471
Author: Jon Kent <jon.kent at gmail.com>
Date:   Tue Jun 17 20:34:56 2014 +0100

    fixes

 ptpd2.init |  135 ++++++++----------------------------------------------------
 1 files changed, 18 insertions(+), 117 deletions(-)
---
diff --git a/ptpd2.init b/ptpd2.init
index 1eb3b78..8f744a4 100755
--- a/ptpd2.init
+++ b/ptpd2.init
@@ -10,7 +10,7 @@
 #           PTP was developed to provide very precise time
 #           coordination of LAN connected computers.
 
-DAEMON=/usr/sbin/ptpd2
+DAEMON=/usr/bin/ptpd2
 prog=PTPd
 RETVAL=0
 PATH=/sbin:/usr/local/bin:$PATH
@@ -32,10 +32,9 @@ start() {
 
 	echo -n "Starting $DAEMON_DESC..."
 
-		$DAEMON $PTPD_OPTIONS
-		sleep 1 
-		status $DAEMON > /dev/null 2>&1
-		RETVAL=$?
+	$DAEMON $PTPD_OPTIONS
+	sleep 1 
+	RETVAL=$?
 
 	if [ "$RETVAL" -eq "0" ] 
 	then 
@@ -48,54 +47,6 @@ start() {
 
 }
 
-checkstatus() {
-	status $DAEMON > /dev/null 2>&1 	
-	RETVAL=$?
-	if [ "$RETVAL" -eq "0" ] 
-	then 
-	        if test -e $PTPD_PID_FILE ; then
-			echo "$prog is running (PID `cat $PTPD_PID_FILE`)."
-		fi
-	else
-			echo "$prog is not running."
-			RETVAL=3
-	fi
-
-	exit $RETVAL
-}
-
-showinfo() {
-	status $DAEMON > /dev/null 2>&1 	
-	RETVAL=$?
-	if [ "$RETVAL" -eq "0" ] 
-	then 
-	        if test -e $PTPD_PID_FILE ; then
-			echo "$prog is running (PID `cat $PTPD_PID_FILE`)."
-
-			taskset -pc `cat $PTPD_PID_FILE`
-		    
-			if test -e $PTPD_STATUS_FILE; then
-
-				cat $PTPD_STATUS_FILE
-
-			fi
-
-		fi
-	else
-			echo "$prog is not running."
-			RETVAL=3
-	fi
-
-	exit $RETVAL
-}
-
-
-checkconfig() {
-
-	$DAEMON -k $PTPD_OPTIONS
-	RETVAL=$?
-}
-
 stop() {
 	status $DAEMON > /dev/null 2>&1 	
 	RETVAL=$?
@@ -114,81 +65,31 @@ stop() {
 	fi
 }
 
-reload() {
-
-	    checkconfig
-	    if [ "$RETVAL" -ne "0" ]; then
-		echo "Reloading $prog: `echo_failure`"
-		exit $RETVAL
-	    fi
-		echo -n $"Reloading $prog: "
-	    killproc $DAEMON -HUP
-	    RETVAL=$?
-	    echo
-}
-
-help() {
-
-        echo $"Usage: $0 {start|stop|restart|reload|checkconfig|condrestart|status|info}"
-        exit 1                         
-}
-
-if [ -z "$1" ]
-then
-    help
-fi
-
 case "$1" in
     start)
-    start
-    RETVAL=$?
-    ;;
+    	start
+    	RETVAL=$?
+ 	   ;;
 
     status)
-    checkstatus
-    RETVAL=$?
-    ;;
-
-    info)
-    showinfo
-    RETVAL=$?
-    ;;
-
+	status ptpd2
+    	RETVAL=$?
+  	  ;;
 
     restart)
-    stop
-	 sleep 1
-    start
-    RETVAL=$?
-    ;;
-
-    reload)
-    reload
-    RETVAL=$?
-
-    ;;
+    	stop
+	sleep 1
+	start
+    	RETVAL=$?
+  	  ;;
 
     stop)
-    stop
+   	 stop
 	 exit 0
-    ;;
-
-    checkconfig)
-    checkconfig
-    RETVAL=$?
-    ;;
-
+    	;;
 
-    condrestart)
-        if [ -f PID_FILE ]; then
-            stop
-            start
-            RETVAL=$?
-        fi
-        ;;
     *)
-
-	echo $"Usage: $0 {start|stop|restart|reload|checkconfig|condrestart|status}"
+	echo $"Usage: $0 {start|stop|restart|status}"
 	RETVAL=3
     ;;
 


More information about the scm-commits mailing list