CA-405864: Drop usage of init.d functions

scripts/Makefile

@@ -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/init.d-attach-static-vdis → scripts/attach-static-vdis

@@ -7,33 +7,28 @@ 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
+	for i in "${STATE_DIR}"/*; do
 	    # Clear the now-stale symlink to the attached disk. From this point the disk will
 	    # be considered 'currently-attached=false'
-	    rm -f ${STATE_DIR}/${i}/disk
+	    rm -f "${i}"/disk
 
 	    # If the disk was supposed to be deleted altogether on reboot then do it now
-	    UUID=$(cat ${STATE_DIR}/${i}/vdi-uuid)
-	    if [ -e ${STATE_DIR}/${i}/delete-next-boot ]; then
+	    UUID=$(cat "${i}"/vdi-uuid)
+	    if [ -e "${i}"/delete-next-boot ]; then
 	       logger "Deleting stale static-configured state for VDI: ${UUID}"
-	       rm -rf ${STATE_DIR}/${i}
+	       rm -rf "${i}"
 	    fi;
 	done
 }
 
 attach_all(){
 	RC=0
-	ALL=$(ls -1 ${STATE_DIR})
 
-	for i in ${ALL}; do
-	    UUID=$(cat ${STATE_DIR}/${i}/vdi-uuid)
+	for i in "${STATE_DIR}"/*; do
+	    UUID=$(cat "${i}"/vdi-uuid)
 	    logger "Attempting to attach VDI: ${UUID}"
-	    OUTPUT=$(/opt/xensource/bin/static-vdis attach ${UUID} 2>&1)
-	    if [ $? -ne 0 ]; then
+	    if ! OUTPUT=$(/opt/xensource/bin/static-vdis attach "${UUID}" 2>&1); then
 	       RC=1
 	       logger "Attempt to attach VDI: ${UUID} failed -- skipping (Error was: ${OUTPUT})"
 	       return $RC
@@ -43,13 +38,10 @@ attach_all(){
 }
 
 detach_all(){
-	ALL=$(ls -1 ${STATE_DIR})
-
-	for i in ${ALL}; do
-	    UUID=$(cat ${STATE_DIR}/${i}/vdi-uuid)
+	for i in "${STATE_DIR}"/*; do
+	    UUID=$(cat "${i}"/vdi-uuid)
 	    logger "Attempting to detach VDI: ${UUID}"
-	    OUTPUT=$(/opt/xensource/bin/static-vdis detach ${UUID} 2>&1)
-	    if [ $? -ne 0 ]; then
+	    if ! OUTPUT=$(/opt/xensource/bin/static-vdis detach "${UUID}" 2>&1); then
 	       logger "Attempt to detach VDI: ${UUID} failed -- skipping (Error was: ${OUTPUT})"
 	    fi
 	done

scripts/on-master-start

@@ -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: "
+	printf "%s" "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
 }
 
@@ -37,6 +31,6 @@ case "$1" in
 	restart
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart}"
 	exit 1
 esac