From 177791970ee86a6653b051ee393801ad37134d70 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 26 Nov 2014 21:01:37 +0100
Subject: Lots of small bugfixes, proxy config WIP, https config WIP,
 translation updates, added masterpassword to pxe menu, ...

---
 inc/trigger.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'inc/trigger.inc.php')

diff --git a/inc/trigger.inc.php b/inc/trigger.inc.php
index ce56c815..790323b5 100644
--- a/inc/trigger.inc.php
+++ b/inc/trigger.inc.php
@@ -15,12 +15,12 @@ class Trigger
 	 * Compile iPXE pxelinux menu. Needs to be done whenever the server's IP
 	 * address changes.
 	 * 
-	 * @param boolean $force force recompilation even if it seems up to date
-	 * @return boolean|string true if already up to date, false if launching task failed, task-id otherwise
+	 * @return boolean|string false if launching task failed, task-id otherwise
 	 */
 	public static function ipxe()
 	{
 		$data = Property::getBootMenu();
+		$data['ipaddress'] = Property::getServerIp();
 		$task = Taskmanager::submit('CompileIPxe', $data);
 		if (!isset($task['id']))
 			return false;
@@ -155,7 +155,7 @@ class Trigger
 				'password' => $vmstore['cifspasswd']
 		));
 	}
-	
+
 	/**
 	 * Check and process all callbacks
 	 */
@@ -214,7 +214,7 @@ class Trigger
 		}
 		return $parent;
 	}
-	
+
 	public static function startDaemons($parent, &$taskids)
 	{
 		$parent = self::triggerDaemons('start', $parent, $taskids);
-- 
cgit v1.2.3-55-g7522