From b4b3ea26d41475868760073e86b0948be161e0b0 Mon Sep 17 00:00:00 2001 From: Tom Elliott Date: Fri, 6 Jan 2017 13:04:39 -0500 Subject: [PATCH] More location fixes --- packages/web/lib/fog/bootmenu.class.php | 2 +- packages/web/lib/fog/system.class.php | 2 +- packages/web/lib/plugins/location/hooks/changeitems.hook.php | 1 - packages/web/management/languages/messages.pot | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/web/lib/fog/bootmenu.class.php b/packages/web/lib/fog/bootmenu.class.php index 22ef380294..3221358288 100644 --- a/packages/web/lib/fog/bootmenu.class.php +++ b/packages/web/lib/fog/bootmenu.class.php @@ -322,7 +322,7 @@ public function __construct($Host = null) $this->_bootexittype = self::$_exitTypes[$exit]; $this->_loglevel = "loglevel=$loglevel"; $this->_KS = self::getClass('KeySequence', $keySequence); - $this->_booturl = "http://{$webserver}{$webroot}service"; + $this->_booturl = "http://{$webserver}/fog/service"; $this->_memdisk = "kernel $memdisk"; $this->_memtest = "initrd $memtest"; $this->_kernel = sprintf( diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php index e749020945..0bcaad162c 100644 --- a/packages/web/lib/fog/system.class.php +++ b/packages/web/lib/fog/system.class.php @@ -53,7 +53,7 @@ private static function _versionCompare() public function __construct() { self::_versionCompare(); - define('FOG_VERSION', '6'); + define('FOG_VERSION', '7'); define('FOG_SCHEMA', 245); define('FOG_BCACHE_VER', 111); define('FOG_SVN_REVISION', 6052); diff --git a/packages/web/lib/plugins/location/hooks/changeitems.hook.php b/packages/web/lib/plugins/location/hooks/changeitems.hook.php index cffc82f3f0..e5973f056d 100644 --- a/packages/web/lib/plugins/location/hooks/changeitems.hook.php +++ b/packages/web/lib/plugins/location/hooks/changeitems.hook.php @@ -197,7 +197,6 @@ public function bootItemSettings($arguments) $bzImage = $arguments['bzImage']; $initrd = $arguments['initrd']; $arguments['webserver'] = $ip; - $arguments['webroot'] = $webroot; $arguments['memdisk'] = "http://${ip}/fog/service/ipxe/$memdisk"; $arguments['memtest'] = "http://${ip}/fog/service/ipxe/$memtest"; $arguments['bzImage'] = "http://${ip}/fog/service/ipxe/$bzImage"; diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot index fe1e70c3d5..7b230aa50f 100644 --- a/packages/web/management/languages/messages.pot +++ b/packages/web/management/languages/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-06 07:59-0500\n" +"POT-Creation-Date: 2017-01-06 13:03-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"