From 7440839c2b1cf7f9c1b812c40742813cd7586983 Mon Sep 17 00:00:00 2001 From: Vlastimil Holer Date: Mon, 10 Jul 2017 11:58:53 +0200 Subject: [PATCH] Update Upstart scripts with dependencies/expect fork/manual --- src/etc/init/one-context-local.conf##deb.upstart.one | 4 ++-- ...e-context-reconfigure-delayed.conf##deb.upstart.one | 4 +++- .../init/one-context-reconfigure.conf##deb.upstart.one | 10 +++++----- src/etc/init/one-context.conf##deb.upstart.one | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/etc/init/one-context-local.conf##deb.upstart.one b/src/etc/init/one-context-local.conf##deb.upstart.one index d518e33..7baac4e 100644 --- a/src/etc/init/one-context-local.conf##deb.upstart.one +++ b/src/etc/init/one-context-local.conf##deb.upstart.one @@ -1,7 +1,7 @@ description "OpenNebula pre-networking contextualization" -author "OpenNebula Systems " +author "OpenNebula Systems " -start on mounted MOUNTPOINT=/ +start on mounted MOUNTPOINT=/ and mounted MOUNTPOINT=/run task diff --git a/src/etc/init/one-context-reconfigure-delayed.conf##deb.upstart.one b/src/etc/init/one-context-reconfigure-delayed.conf##deb.upstart.one index 68751fc..71b53c3 100644 --- a/src/etc/init/one-context-reconfigure-delayed.conf##deb.upstart.one +++ b/src/etc/init/one-context-reconfigure-delayed.conf##deb.upstart.one @@ -1,6 +1,8 @@ description "OpenNebula delayed reconfiguration" -author "OpenNebula Systems " +author "OpenNebula Systems " +manual task +expect fork exec /usr/sbin/one-context-reconfigure diff --git a/src/etc/init/one-context-reconfigure.conf##deb.upstart.one b/src/etc/init/one-context-reconfigure.conf##deb.upstart.one index f30868d..c7ebce6 100644 --- a/src/etc/init/one-context-reconfigure.conf##deb.upstart.one +++ b/src/etc/init/one-context-reconfigure.conf##deb.upstart.one @@ -1,9 +1,9 @@ description "OpenNebula reconfiguration" -author "OpenNebula Systems " +author "OpenNebula Systems " +manual task -script - export TIMEOUT=0 - exec /usr/sbin/one-context-reconfigure -end script +env TIMEOUT=0 + +exec /usr/sbin/one-context-reconfigure diff --git a/src/etc/init/one-context.conf##deb.upstart.one b/src/etc/init/one-context.conf##deb.upstart.one index 6f2b309..82f9714 100644 --- a/src/etc/init/one-context.conf##deb.upstart.one +++ b/src/etc/init/one-context.conf##deb.upstart.one @@ -1,7 +1,7 @@ description "OpenNebula contextualization" -author "OpenNebula Systems " +author "OpenNebula Systems " -start on (filesystem and started rsyslog) +start on (runlevel [2345] and stopped one-context-local) task