------------------------------------------------------------
revno: 66
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Wed 2014-04-16 12:13:07 +0100
message:
auto update
removed:
etc/init.d/ipx
modified:
etc/init.d/sbnc
etc/init/neutron-vpn-agent.conf
--
lp:~upstart-devel/upstart/upstart-jobs
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs
Your team Upstart Reviewers is subscribed to branch
lp:~upstart-devel/upstart/upstart-jobs.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs/+edit-subscription
=== removed file 'etc/init.d/ipx'
--- etc/init.d/ipx 2014-04-09 00:24:49 +0000
+++ etc/init.d/ipx 1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: ipx
-# Required-Start: $remote_fs $syslog
-# Required-Stop: $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-### END INIT INFO
-#
-# ipx Bring up/down IPX networking
-#
-
-test -f /usr/sbin/ipx_configure || exit 0
-
-. /etc/ipx.conf
-
-# See how we were called.
-case "$1" in
- start)
- if [ ${IPX_CONFIGURED} = "yes" ]; then
- if [ ${IPX_INTERNAL_NET} = "yes" ]; then
- ipx_internal_net add ${IPX_NETNUM}
- else
- ipx_interface add -p ${IPX_DEVICE} \
- ${IPX_FRAME} ${IPX_NETNUM}
- fi
- if [ ${IPX_SERVER_ROUTE} = "yes" ]; then
- ipx_route add ${IPX_SERVER_NETNUM} \
- ${IPX_NETNUM} \
- ${IPX_SERVER_NODENUM}
- fi
- else
- ipx_configure \
- --auto_primary=${IPX_AUTO_PRIMARY} \
- --auto_interface=${IPX_AUTO_INTERFACE}
- fi
- ;;
- stop)
- ipx_configure --auto_primary=off --auto_interface=off
- ipx_interface delall
- ;;
- restart|force-reload)
- echo -n "Reconfiguring IPX..."
- /etc/init.d/ipx stop
- sleep 2
- /etc/init.d/ipx start
- echo " done."
- ;;
- *)
- echo "Usage: /etc/init.d/ipx {start|stop|restart}"
- exit 1
-esac
-
-exit 0
=== modified file 'etc/init.d/sbnc'
--- etc/init.d/sbnc 2014-04-09 00:24:49 +0000
+++ etc/init.d/sbnc 2014-04-16 11:13:07 +0000
@@ -16,7 +16,10 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin
NAME=/usr/sbin/sbnc
+PIDFILE=/var/run/sbnc/sbnc.pid
USER=sbnc
+OPTIONS="--config /etc/sbnc/ --log /var/log/sbnc/ --pid $PIDFILE"
+. /lib/lsb/init-functions
# See if the daemons are there
test -f ${NAME} || exit 0
@@ -53,7 +56,7 @@
fi
echo -n "Starting sbnc daemon:"
echo -n " sbnc"
- start-stop-daemon --start --quiet --background --chuid ${USER} --exec ${NAME}
+ start-stop-daemon --start --background --chuid ${USER} --exec ${NAME} -- $OPTIONS
echo "."
;;
stop)
@@ -74,6 +77,10 @@
start-stop-daemon --start --quiet --background --chuid ${USER} --exec ${NAME}
echo "."
;;
+ status)
+ status_of_proc -p $PIDFILE "sbnc" "sbnc"
+ exit $?
+ ;;
*)
echo "Usage: $0 {start|stop|restart|reload|force-reload}"
exit 1
=== modified file 'etc/init/neutron-vpn-agent.conf'
--- etc/init/neutron-vpn-agent.conf 2014-04-11 11:10:05 +0000
+++ etc/init/neutron-vpn-agent.conf 2014-04-16 11:13:07 +0000
@@ -12,6 +12,11 @@
pre-start script
mkdir -p /var/run/neutron
chown neutron:root /var/run/neutron
+ # Check to see if openvswitch plugin in use by checking
+ # status of cleanup upstart configuration
+ if status neutron-ovs-cleanup; then
+ start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-vpn-agent
+ fi
end script
exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
