Improve system messages

mikopbx · May 16, 2024 · 930e86b · 930e86b
1 parent 564466a
commit 930e86b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Core/System/PBXRecovery.php b/src/Core/System/PBXRecovery.php
@@ -97,7 +97,9 @@ private function handleInput(string $input)
                 // Prepare for reinstalling
                 file_put_contents('/tmp/ejectcd', '');
                 $pbx_firmwarePath = Util::which('pbx_firmware');
-                passthru("{$pbx_firmwarePath} /offload/firmware.img.gz {$this->DEVICE}");
+                $recovery_cmd = 'exec < /dev/console > /dev/console 2>/dev/console;' .
+                    "{$pbx_firmwarePath} /offload/firmware.img.gz {$this->DEVICE}";
+                passthru($recovery_cmd);
                 break;
             case '3':
                 // Cancel operation

diff --git a/src/Core/System/RootFS/sbin/mountoffload b/src/Core/System/RootFS/sbin/mountoffload
@@ -257,6 +257,7 @@ for disk in $disks; do
   # Check for the presence of a "livecd" flag file in the root of the offload disk.
   if [ -f /offload/livecd ]; then
     echo " - Found LiveCD image!"
+    echo
     echo "  Press any key within 30 seconds to boot from LiveCD..."
     read -t 30 -n 1 input
     if [ $? = 0 ]; then