Stable Release - 1.5.10.1629

Stable Release PR For 1.5.10.1629 - 2024-11-15
FOGProject · Nov 15, 2024 · 831a95f · 831a95f
2 parents 2bf0e8c + 32a0477
commit 831a95f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/lib/common/functions.sh b/lib/common/functions.sh
@@ -538,7 +538,7 @@ configureFTP() {
 configureDefaultiPXEfile() {
     dots 'Configuring default iPXE file'
     [[ -z $webroot ]] && webroot='/'
-    echo -e "#!ipxe\nset arch \${buildarch}\nparams\nparam mac0 \${net0/mac}\nparam arch \${arch}\nparam platform \${platform}\nparam product \${product}\nparam manufacturer \${product}\nparam ipxever \${version}\nparam filename \${filename}\nparam sysuuid \${uuid}\nisset \${net1/mac} && param mac1 \${net1/mac} || goto bootme\nisset \${net2/mac} && param mac2 \${net2/mac} || goto bootme\n:bootme\nchain ${httpproto}://$ipaddress${webroot}service/ipxe/boot.php##params" > "$tftpdirdst/default.ipxe"
+    echo -e "#!ipxe\nset arch \${buildarch}\niseq \${arch} i386 && cpuid --ext 29 && set arch x86_64 ||\nparams\nparam mac0 \${net0/mac}\nparam arch \${arch}\nparam platform \${platform}\nparam product \${product}\nparam manufacturer \${product}\nparam ipxever \${version}\nparam filename \${filename}\nparam sysuuid \${uuid}\nisset \${net1/mac} && param mac1 \${net1/mac} || goto bootme\nisset \${net2/mac} && param mac2 \${net2/mac} || goto bootme\n:bootme\nchain ${httpproto}://$ipaddress${webroot}service/ipxe/boot.php##params" > "$tftpdirdst/default.ipxe"
     errorStat $?
 }
 configureTFTPandPXE() {

diff --git a/packages/web/lib/fog/bootmenu.class.php b/packages/web/lib/fog/bootmenu.class.php
@@ -557,6 +557,7 @@ private function _chainBoot($debug = false, $shortCircuit = false)
         if (!(isset($this->_hiddenmenu) && $this->_hiddenmenu) || $shortCircuit) {
             $Send['chainnohide'] = array(
                 'set arch ${buildarch}',
+                'iseq ${arch} i386 && cpuid --ext 29 && set arch x86_64 ||',
                 'params',
                 'param mac0 ${net0/mac}',
                 'param arch ${arch}',
@@ -582,6 +583,7 @@ private function _chainBoot($debug = false, $shortCircuit = false)
             );
             $Send['chainhide'] = array(
                 'set arch ${buildarch}',
+                'iseq ${arch} i386 && cpuid --ext 29 && set arch x86_64 ||',
                 "iseq \${platform} efi && set key 0x1b || set key $KSKey",
                 "iseq \${platform} efi && set keyName ESC || "
                 . "set keyName $KSName",
@@ -739,6 +741,7 @@ public function delConf()
     {
         $Send['delconfirm'] = array(
             'set arch ${buildarch}',
+            'iseq ${arch} i386 && cpuid --ext 29 && set arch x86_64 ||',
             'params',
             'prompt --key y Would you like to delete this host? (y/N): && goto deleteyes || goto deleteno',
             ':deleteyes',
@@ -766,6 +769,7 @@ public function aprvConf()
     {
         $Send['aprvconfirm'] = array(
             'set arch ${buildarch}',
+            'iseq ${arch} i386 && cpuid --ext 29 && set arch x86_64 ||',
             'params',
             'prompt --key y Would you like to approve this host? (y/N): && goto answeryes || goto answerno',
             ':answeryes',
@@ -793,6 +797,7 @@ public function keyreg()
     {
         $Send['keyreg'] = array(
             'set arch ${buildarch}',
+            'iseq ${arch} i386 && cpuid --ext 29 && set arch x86_64 ||',
             'echo -n Please enter the product key : ',
             'read key',
             'params',
@@ -847,6 +852,7 @@ public function sesscheck()
                 'clear sessname',
                 'sleep 3',
                 'set arch ${buildarch}',
+                'iseq ${arch} i386 && cpuid --ext 29 && set arch x86_64 ||',
                 'params',
                 'param mac0 ${net0/mac}',
                 'param arch ${arch}',
@@ -872,6 +878,7 @@ public function sessjoin()
     {
         $Send['joinsession'] = array(
             'set arch ${buildarch}',
+            'iseq ${arch} i386 && cpuid --ext 29 && set arch x86_64 ||',
             'echo -n Please enter the session name to join > ',
             'read sessname',
             'params',
@@ -1971,6 +1978,7 @@ public function printDefault()
         $Send['head'] = self::fastmerge(
             array(
                 'set arch ${buildarch}',
+                'iseq ${arch} i386 && cpuid --ext 29 && set arch x86_64 ||',
                 'goto get_console',
                 ':console_set',
             ),

diff --git 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', '1.5.10.1622');
+        define('FOG_VERSION', '1.5.10.1629');
         define('FOG_SCHEMA', 273);
         define('FOG_BCACHE_VER', 141);
         define('FOG_CLIENT_VERSION', '0.13.0');

diff --git a/packages/web/lib/plugins/slack/events/snapintaskcomplete_slack.event.php b/packages/web/lib/plugins/slack/events/snapintaskcomplete_slack.event.php
@@ -68,9 +68,10 @@ public function onEvent($event, $data)
             $args = array(
                 'channel' => $Token->get('name'),
                 'text' => sprintf(
-                'The snapin has completed installation on %s with status code: %s',
-                $data['Host']->get('name'),
-                $data['SnapinTask']->get('return')
+                    'The %s snapin has completed installation on %s with status code: %s',
+                    $data['Snapin']->get('name'),
+                    $data['Host']->get('name'),
+                    $data['SnapinTask']->get('return')
                 )
             );
             $Token->call('chat.postMessage', $args);