summaryrefslogtreecommitdiffstats
path: root/inc/trigger.inc.php
diff options
context:
space:
mode:
authorSimon Rettberg2014-11-26 21:01:37 +0100
committerSimon Rettberg2014-11-26 21:01:37 +0100
commit177791970ee86a6653b051ee393801ad37134d70 (patch)
tree696fd696c89d4d587365fa7172ab0e184e183f07 /inc/trigger.inc.php
parentAdd HTTPS config module for webif, update everything to use FileUtil class, m... (diff)
downloadslx-admin-177791970ee86a6653b051ee393801ad37134d70.tar.gz
slx-admin-177791970ee86a6653b051ee393801ad37134d70.tar.xz
slx-admin-177791970ee86a6653b051ee393801ad37134d70.zip
Lots of small bugfixes, proxy config WIP, https config WIP, translation updates, added masterpassword to pxe menu, ...
Diffstat (limited to 'inc/trigger.inc.php')
-rw-r--r--inc/trigger.inc.php8
1 files changed, 4 insertions, 4 deletions
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);