Index: sources/device/DeviceController.cpp
===================================================================
diff -u -rca40cfec5ff6b63d4685ceb2e62ebe9366adcfd0 -rcad1ea2c3c42c93461f4197921f8a5938fe872c8
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision ca40cfec5ff6b63d4685ceb2e62ebe9366adcfd0)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision cad1ea2c3c42c93461f4197921f8a5938fe872c8)
@@ -985,17 +985,21 @@
     bool ok = true;
     QString   fileSrc = vFileName;
     QFileInfo fileInfo(vFileName);
-
-    bool isBootPOST = _Logger.isBootPOST( vFileName );
-    bool isCurrent  = fileInfo.lastModified().date() == QDate::currentDate();
-    if ( isBootPOST && isCurrent ) return false; // no log backup if it is the BootPOST log file.
-
     QString   filePath(fileInfo.absolutePath());
     QString   fileBase(fileInfo.baseName());
     QString   fileSufx(fileInfo.completeSuffix().prepend(_Logger.logFileNamePendingSubExt()));
     QString   fileDest(QString("%1/%2.%3").arg(filePath, fileBase, fileSufx));
     QString   gzipSufx(gLogCompress ? Storage::gzipExt : "");
 
+    bool isBootPOST = _Logger.isBootPOST( vFileName );
+    bool isCurrent  = fileInfo.lastModified().date() == QDate::currentDate();
+    if ( isBootPOST && isCurrent ) {
+        // no log backup if it is the BootPOST log file, only rename and add the serial to it.
+        fileDest = QString("%1/%2.%3").arg(filePath, fileBase.prepend(_Logger.logFileNameHDSN() + _Logger.fileSeparator()), fileInfo.completeSuffix());
+        ok = QFile::rename(fileSrc, fileDest);
+        return false;
+    }
+
     if ( gLogCompress ) {
         ok = FileHandler::backupFile(fileSrc);
     }
@@ -1005,13 +1009,10 @@
     // therefore it is not bootPOST.
     // Now try to back up the skipped bootPOST log.
     if ( ! isBootPOST ) {
-        QString fileBoot = fileSrc;
-        fileBoot .replace( _Logger.logFileNameHDSN(), _Logger.logFileNameHDSN_default() );
-        if ( ! QFile::exists(fileBoot) ) goto lOut;
-
         fileSrc .replace( _Logger.logFileNameHDSN(), _Logger.logFileNameHDSN() + _Logger.fileSeparator() + _Logger.logFileNameHDSN_default() );
         fileDest.replace( _Logger.logFileNameHDSN(), _Logger.logFileNameHDSN() + _Logger.fileSeparator() + _Logger.logFileNameHDSN_default() );
-        ok = QFile::rename(fileBoot, fileSrc);
+        if ( ! QFile::exists(fileSrc) ) goto lOut;
+
         ok = FileHandler::backupFile(fileSrc);
         ok = QFile::rename(fileSrc + gzipSufx, fileDest + gzipSufx);
     }