CA-405864: Drop usage of init.d functions

init.d are from initscripts which are legacy and removed from XS9
This commit drop the usage of the scripts

Signed-off-by: Lin Liu <[email protected]>

Author: liulinC

ocaml/squeezed/scripts/init.d-squeezed

@@ -5,9 +5,6 @@
 # chkconfig: 2345 23 82
 # description: XCP RRD daemon plugins
 
-# Source function library.
-. /etc/init.d/functions
-
 # names
 NAME="xcp-rrdd-plugins"
 FULL_NAME="the XCP RRDD daemon plugins"
@@ -37,9 +34,8 @@ start() {
 
 		if [ -e ${SUBSYS_FILE} ]; then
 			if [ -e ${PID_FILE} ] && [ -e /proc/`cat ${PID_FILE}` ]; then
-				echo -n $"cannot start ${NAME}: already running."
-				failure $"cannot start ${NAME}: already running."
-				echo
+				echo $"cannot start ${NAME}: already running."
+				logger $"cannot start ${NAME}: already running."
 				WORST_RETVAL=1
 				continue
 			fi
@@ -59,8 +55,8 @@ start() {
 			if [ $? -eq 0 ]; then
 				touch ${SUBSYS_FILE}
 				SUCCESS=1
-				success
-				echo
+				logger $"[ OK ]"
+				echo -e $"\t[ OK ]"
 				break
 			fi
 			sleep 1
@@ -70,11 +66,10 @@ start() {
 		if [ ${SUCCESS} -eq 1 ]; then
 			continue
 		fi
-		echo -n $"failed to start ${NAME}."
-		failure $"failed to start ${NAME}."
+		echo $"failed to start ${NAME}."
+		logger $"failed to start ${NAME}."
 		killproc ${NAME}
 		rm -f ${SUBSYS_FILE} ${PID_FILE}
-		echo
 	done
 	return $WORST_RETVAL
 }
@@ -87,9 +82,8 @@ stop() {
 		local SUBSYS_FILE=${SUBSYS_PREFIX}${NAME}
 
 		if [ ! -e ${SUBSYS_FILE} ]; then
-			echo -n $"cannot stop ${NAME}: daemon is not running."
-			failure $"cannot stop ${NAME}: daemon is not running."
-			echo
+			echo $"cannot stop ${NAME}: daemon is not running."
+			logger $"cannot stop ${NAME}: daemon is not running."
 			continue
 		fi
 

ocaml/xcp-rrdd/bin/rrdp-scripts/rrdd-plugins-init

@@ -46,9 +46,9 @@ install:
 	$(IDATA) xapi.conf $(DESTDIR)$(XAPICONF)
 	$(IPROG) db.conf.skel $(DESTDIR)$(ETCXENDIR)/db.conf
 	$(IPROG) rio.db.conf.skel $(DESTDIR)$(ETCXENDIR)/db.conf.rio
-	$(IPROG) init.d-xapi $(DESTDIR)$(LIBEXECDIR)/xapi-init
-	$(IPROG) init.d-save-boot-info $(DESTDIR)$(LIBEXECDIR)/save-boot-info
-	$(IPROG) init.d-attach-static-vdis $(DESTDIR)$(LIBEXECDIR)/attach-static-vdis
+	$(IPROG) xapi-init $(DESTDIR)$(LIBEXECDIR)/xapi-init
+	$(IPROG) save-boot-info $(DESTDIR)$(LIBEXECDIR)/save-boot-info
+	$(IPROG) attach-static-vdis $(DESTDIR)$(LIBEXECDIR)/attach-static-vdis
 	$(IPROG) generate-iscsi-iqn $(DESTDIR)$(LIBEXECDIR)/generate-iscsi-iqn
 	$(IPROG) network-init $(DESTDIR)$(LIBEXECDIR)/network-init
 	$(IPROG) control-domain-params-init $(DESTDIR)$(LIBEXECDIR)/control-domain-params-init

scripts/Makefile

@@ -7,9 +7,6 @@ STATE_DIR=/etc/xensource/static-vdis
 [ -d ${STATE_DIR} ] || exit 0
 [ -e /opt/xensource/bin/static-vdis ] || exit 0
 
-# Source function library.
-. /etc/init.d/functions
-
 clear_stale_state(){
 	for i in $(ls -1 ${STATE_DIR}); do
 	    # Clear the now-stale symlink to the attached disk. From this point the disk will

scripts/init.d-attach-static-vdis renamed to scripts/attach-static-vdis

@@ -1,23 +1,17 @@
 #!/bin/sh
 
 # Example on-master-start script
-
-# Source function library.
-. /etc/init.d/functions
-
+#
 start() {
 	echo -n $"Assuming role of master: "
 	touch /tmp/master
-	echo -n $"OK"
-	success $"OK"
-	echo
+	echo $"OK"
 	return 0
 }
 
 stop() {
-	echo -n $"Dropping role of master: "
+	echo $"Dropping role of master: "
 	rm -f /tmp/master
-	echo
 	return 0
 }
 

scripts/on-master-start

@@ -1,8 +1,5 @@
 #! /bin/bash
 
-# Source function library.
-. /etc/init.d/functions
-
 if [ -f /etc/sysconfig/xapi ]; then
   . /etc/sysconfig/xapi
 fi
@@ -23,9 +20,8 @@ start() {
 
         if [ -e /var/lock/subsys/xapi ]; then
 	    if [ -e /var/run/xapi.pid ] && [ -e /proc/`cat /var/run/xapi.pid` ]; then
-		echo -n $"cannot start xapi: already running.";
-		failure $"cannot start xapi: already running.";
-		echo
+		echo $"cannot start xapi: already running.";
+		logger "cannot start xapi: already running.";
 		return 1
 	    fi
 	fi
@@ -39,9 +35,8 @@ start() {
 	if [ -e ${XAPI_BLOCK_STARTUP_COOKIE} ]; then
             if [ -e ${XAPI_BOOT_TIME_INFO_UPDATED} ]; then
 	    logger "Aborting xapi startup because ${XAPI_BLOCK_STARTUP_COOKIE} is present and the system has just booted. Remove file and try again";
-	    echo -n $"startup blocked."
-	    failure $"startup blocked."
-	    echo
+	    echo $"startup blocked."
+	    logger $"startup blocked."
 	    return 1
             fi
 	fi
@@ -69,9 +64,8 @@ start() {
 stop() {
 	echo -n $"Stopping xapi: "
         if [ ! -e /var/lock/subsys/xapi ]; then
-	    echo -n $"cannot stop xapi: xapi is not running."
-	    failure $"cannot stop xapi: xapi is not running."
-	    echo
+	    echo $"cannot stop xapi: xapi is not running."
+	    logger $"cannot stop xapi: xapi is not running."
 	    return 1;
 	fi
 	rm -f ${XAPI_STARTUP_COOKIE}
@@ -88,10 +82,9 @@ stop() {
 		# Finish if all xapis have gone 
 		xapi_pids=$(pidof xapi)
 		if [ -z "$xapi_pids" ]; then
-			logger "xapi stopped successfully"
+			echo $"xapi stopped successfully"
 			rm -f /var/run/xapi.pid /var/lock/subsys/xapi
-			success $"xapi stopped successfully"
-			echo
+			logger $"xapi stopped successfully"
 			return 0
 		fi
 		sleep 1
@@ -103,13 +96,11 @@ stop() {
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ]; then
 	    logger "xapi stopped forcibly"
-	    success $"xapi stopped successfully"
-	    echo
+	    echo $"xapi stopped successfully"
 	    rm -f /var/run/xapi.pid /var/lock/subsys/xapi
 	else
 	    logger "failed to stop xapi"
-	    failure $"failed to stop xapi"
-	    echo
+	    echo $"failed to stop xapi"
 	fi
 
 	return $RETVAL

scripts/init.d-save-boot-info renamed to scripts/save-boot-info

@@ -11,7 +11,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
-test -f /etc/init.d/functions && source /etc/init.d/functions
 
 FILENAME=`basename $0`
 LOCKFILE='/dev/shm/xe_toolstack_restart.lock'