Update Upstart scripts with dependencies/expect fork/manual

8 years ago · 7440839c2b
parent 2afb78747d
commit 7440839c2b
4 changed files with 12 additions and 10 deletions
--- 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 <support@opennebula.systems>"
+author "OpenNebula Systems <support@opennebula.systems>"

-start on mounted MOUNTPOINT=/
+start on mounted MOUNTPOINT=/ and mounted MOUNTPOINT=/run

 task

--- 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 <support@opennebula.systems>"
+author "OpenNebula Systems <support@opennebula.systems>"

+manual
 task
+expect fork

 exec /usr/sbin/one-context-reconfigure
--- 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 <support@opennebula.systems>"
+author "OpenNebula Systems <support@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
--- 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 <support@opennebula.systems>"
+author "OpenNebula Systems <support@opennebula.systems>"

-start on (filesystem and started rsyslog)
+start on (runlevel [2345] and stopped one-context-local)

 task