All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 34557279 authored by Mike Hibler's avatar Mike Hibler

Add our own version of the elvin_gateway startup script which wraps

elvin_gateway with the daemon_wrapper
parent 1a25da73
...@@ -2520,6 +2520,7 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -2520,6 +2520,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
vis/floormap vis/webfloormap \ vis/floormap vis/webfloormap \
rc.d/GNUmakefile rc.d/2.mysql-server.sh rc.d/3.testbed.sh \ rc.d/GNUmakefile rc.d/2.mysql-server.sh rc.d/3.testbed.sh \
rc.d/2.elvind.sh rc.d/3.plab.sh rc.d/2.dhcpd.sh rc.d/3.and.sh \ rc.d/2.elvind.sh rc.d/3.plab.sh rc.d/2.dhcpd.sh rc.d/3.and.sh \
rc.d/3.elvin_gateway.sh \
tools/GNUmakefile rc.d/1.mysql-server.sh tools/svn/GNUmakefile \ tools/GNUmakefile rc.d/1.mysql-server.sh tools/svn/GNUmakefile \
tools/pcapper/GNUmakefile tools/teachswitch/GNUmakefile \ tools/pcapper/GNUmakefile tools/teachswitch/GNUmakefile \
tools/webcamapplet/GNUmakefile tools/whol/GNUmakefile \ tools/webcamapplet/GNUmakefile tools/whol/GNUmakefile \
......
...@@ -901,6 +901,7 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -901,6 +901,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
vis/floormap vis/webfloormap \ vis/floormap vis/webfloormap \
rc.d/GNUmakefile rc.d/2.mysql-server.sh rc.d/3.testbed.sh \ rc.d/GNUmakefile rc.d/2.mysql-server.sh rc.d/3.testbed.sh \
rc.d/2.elvind.sh rc.d/3.plab.sh rc.d/2.dhcpd.sh rc.d/3.and.sh \ rc.d/2.elvind.sh rc.d/3.plab.sh rc.d/2.dhcpd.sh rc.d/3.and.sh \
rc.d/3.elvin_gateway.sh \
tools/GNUmakefile rc.d/1.mysql-server.sh tools/svn/GNUmakefile \ tools/GNUmakefile rc.d/1.mysql-server.sh tools/svn/GNUmakefile \
tools/pcapper/GNUmakefile tools/teachswitch/GNUmakefile \ tools/pcapper/GNUmakefile tools/teachswitch/GNUmakefile \
tools/webcamapplet/GNUmakefile tools/whol/GNUmakefile \ tools/webcamapplet/GNUmakefile tools/whol/GNUmakefile \
......
#! /bin/sh
#
# PROVIDE: elvin_gateway
# REQUIRE: pubsub
#
case $1 in
start|faststart)
if test -x /usr/local/libexec/elvin_gateway; then
if [ -x @prefix@/sbin/daemon_wrapper ]; then
echo -n " elvin_gateway wrapper"
@prefix@/sbin/daemon_wrapper -l @prefix@/log/elvin_gateway.log \
/usr/local/libexec/elvin_gateway -d
else
echo -n " elvin_gateway"
/usr/local/libexec/elvin_gateway
fi
fi
;;
stop)
if [ -r /var/run/elvin_gateway_wrapper.pid ]; then
kill `cat /var/run/elvin_gateway_wrapper.pid`
else
killall elvin_gateway
fi
;;
esac
...@@ -12,13 +12,17 @@ SUBDIR = rc.d ...@@ -12,13 +12,17 @@ SUBDIR = rc.d
WINSUPPORT = @WINSUPPORT@ WINSUPPORT = @WINSUPPORT@
PELABSUPPORT = @PELABSUPPORT@ PELABSUPPORT = @PELABSUPPORT@
ELVINCOMPAT = @ELVIN_COMPAT@
SYSTEM := $(shell uname -s) SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
RC_SCRIPTS = 2.mysql-server.sh 3.testbed.sh \ RC_SCRIPTS = 2.mysql-server.sh 3.testbed.sh \
2.dhcpd.sh 1.mysql-client.sh 2.dhcpd.sh 1.mysql-client.sh
OPS_SCRIPTS = 2.elvind.sh 3.and.sh 1.mysql-client.sh 1.mysql-server.sh OPS_SCRIPTS = 3.and.sh 1.mysql-client.sh 1.mysql-server.sh
ifeq ($(ELVINCOMPAT),1)
OPS_SCRIPTS += 2.elvind.sh 3.elvin_gateway.sh
endif
ifeq ($(SYSTEM),FreeBSD) ifeq ($(SYSTEM),FreeBSD)
FBSDVERSION := $(shell uname -v | sed -e 's/FreeBSD \([0-9]\).*/FreeBSD\1/') FBSDVERSION := $(shell uname -v | sed -e 's/FreeBSD \([0-9]\).*/FreeBSD\1/')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment