Fix system upgrade for Amazon AWS with nvme storage

mikopbx · Apr 10, 2024 · b43b92d · b43b92d
1 parent ddfce41
commit b43b92d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/Core/System/RootFS/sbin/check-update-pbx b/src/Core/System/RootFS/sbin/check-update-pbx
@@ -53,6 +53,8 @@ do
       # shellcheck source=/system/update.sh
       source "$updateScript";
 
+      rm "$updateScript";
+
       # Umount the disk.
       umount "$disk";
 

diff --git a/src/Core/System/RootFS/sbin/pbx_firmware b/src/Core/System/RootFS/sbin/pbx_firmware
@@ -43,7 +43,8 @@ if [ "$md5Hash" != "$(/bin/gunzip -c "${img_file}" |/bin/busybox md5sum | /bin/b
     echoToTeletype " - Update aborted...";
     rm -rf "$img_file";
     sleep 3;
-    /sbin/pbx_reboot;
+    # Set a flag to indicate rebooting.
+    touch /tmp/rebooting;
 else
     # Inform the user of successful checksum verification
     echoToTeletype " - Successful checksum verification";
@@ -143,7 +144,8 @@ if [ -f /offload/livecd ]; then
   touch /tmp/ejectcd
 
   echoToTeletype " - rebooting system..."
-  /sbin/pbx_reboot;
+  # Set a flag to indicate rebooting.
+  touch /tmp/rebooting;
 else
   # Format the 3rd partition and mount it as /cf/. Then, copy the configuration back and remove the image file
   echo " - conf partition: ${partition3Name}";

diff --git a/src/Core/System/SystemLoader.php b/src/Core/System/SystemLoader.php
@@ -276,7 +276,7 @@ public function startSystem(): bool
         }
 
         // Connect storage in a cloud if needed
-        $this->echoStartMsg(' - Auto connect storage for a cloud ...'.PHP_EOL);
+        $this->echoStartMsg(' - Auto connect storage for a cloud ...');
         if (!$this->isDocker && !$this->isRecoveryMode) {
             $connectResult = Storage::connectStorageInCloud();
             $this->echoResultMsg($connectResult);

diff --git a/src/PBXCoreREST/Lib/System/UpgradeFromImageAction.php b/src/PBXCoreREST/Lib/System/UpgradeFromImageAction.php
@@ -161,10 +161,9 @@ private static function writeUpdateScript(array $parameters) :array
     {
         $messages = [];
         $updateSh = "#!/bin/sh".PHP_EOL.
-            'rm -rf "$0";'.PHP_EOL.
             "export storage_uuid='{$parameters['storage_uuid']}';".PHP_EOL.
-            "export cf_uuid='{$parameters['cf_uuid']};".PHP_EOL.
-            "export updateFile='{$parameters['imageFileLocation']};".PHP_EOL;
+            "export cf_uuid='{$parameters['cf_uuid']}';".PHP_EOL.
+            "export updateFile='{$parameters['imageFileLocation']}';".PHP_EOL;
 
         // Mount boot partition
         $systemDir = '/system';