Skip to content
Snippets Groups Projects
Commit 52bd3e09 authored by Jonathan Hanks's avatar Jonathan Hanks
Browse files

Merge branch 'usable_no_model_start' into 'master'

startup sequencer: when START_MODELS is false, run startup sequencer, but...

See merge request cds/advligorts!260
parents e9b2883b f7b04278
No related branches found
No related tags found
1 merge request!260startup sequencer: when START_MODELS is false, run startup sequencer, but...
......@@ -19,9 +19,6 @@ class Sequencer(object):
self.processes = FrontEndProcesses(target_dir)
def create_start_sequence(self):
if not self.options["START_MODELS"]:
klog("START_MODELS is false. Quitting")
return
if self.options["CDSRFM"]:
klog("is CDSRFM host")
before_world, world = self.create_cdsrfm_start_sequence(self.processes,
......@@ -29,7 +26,7 @@ class Sequencer(object):
else:
klog("is standard front end host")
before_world, world = self.create_frontend_start_sequence()
self.link_sequence(before_world, world)
self.link_sequence(before_world, world, self.options["START_MODELS"])
def create_frontend_start_sequence(self):
before_world = []
......@@ -75,7 +72,7 @@ class Sequencer(object):
]
return before_world, world
def link_sequence(self, before_world, world):
def link_sequence(self, before_world, world, start_models):
self.processes.create_world_target()
# link the first of each process to multi-user or to the world target
......@@ -86,7 +83,10 @@ class Sequencer(object):
self.processes.part_of(process.start, "rts-world.target")
if len(before_world) > 0:
self.processes.after("rts-world.target", before_world[-1].end)
self.processes.link_to("rts-world.target", "multi-user.target")
if start_models:
self.processes.link_to("rts-world.target", "multi-user.target")
else:
klog("START_MODELS is false. Skipping model start.")
self.processes.serialize_processes(before_world + world)
class Delay(object):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment