From d949130ff1c948ba85f501022e9a090cab305147 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 25 Mar 2019 12:36:26 +0100
Subject: [inc/Trigger] Wait for taskmanager on bootup

---
 inc/event.inc.php   | 2 +-
 inc/trigger.inc.php | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/inc/event.inc.php b/inc/event.inc.php
index 4e68ab6d..0b84df16 100644
--- a/inc/event.inc.php
+++ b/inc/event.inc.php
@@ -37,8 +37,8 @@ class Event
 
 		// Tasks: fire away
 		$mountStatus = false;
-		$mountId = Trigger::mount();
 		$autoIp = Trigger::autoUpdateServerIp();
+		$mountId = Trigger::mount();
 		$ldadpId = Trigger::ldadp();
 		$ipxeId = Trigger::ipxe();
 
diff --git a/inc/trigger.inc.php b/inc/trigger.inc.php
index e89a9a17..cc603719 100644
--- a/inc/trigger.inc.php
+++ b/inc/trigger.inc.php
@@ -50,7 +50,12 @@ class Trigger
 	 */
 	public static function autoUpdateServerIp()
 	{
-		$task = Taskmanager::submit('LocalAddressesList');
+		for ($i = 0; $i < 5; ++$i) {
+			$task = Taskmanager::submit('LocalAddressesList');
+			if ($task !== false)
+				break;
+			sleep(1);
+		}
 		if ($task === false)
 			return false;
 		$task = Taskmanager::waitComplete($task, 10000);
-- 
cgit v1.2.3-55-g7522