Index: main.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rf9f59e63bc8412c38b50ec155bcc37d1535800c4
--- main.cpp	(.../main.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ main.cpp	(.../main.cpp)	(revision f9f59e63bc8412c38b50ec155bcc37d1535800c4)
@@ -106,8 +106,10 @@
 bool        gUseRootHome                = false ;
 
 QString     gParserErrorText            = "";
+QString     gStandard_tmp               = QString("/%1/").arg("tmp");
 
 
+
 /*!
  * \page    CommandLineSwitches Denali Command Line Switches
  * \verbatim
@@ -447,7 +449,7 @@
  */
 int main(int argc, char *argv[])
 {
-
+    qDebug() << "Add:" << gStandard_tmp;
 #ifndef SQUISH_COCO_BULD
     signal(SIGINT , signalhandler);
     signal(SIGTERM, signalhandler);
Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rf9f59e63bc8412c38b50ec155bcc37d1535800c4
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision f9f59e63bc8412c38b50ec155bcc37d1535800c4)
@@ -283,7 +283,7 @@
     qint64 mCTotal  = 0;
 
     bool isMounted      = FileHandler::isMounted(Storage::SDCard_Base_Path_Name);
-    QString pathToCheckSpace = isMounted ? Storage::SDCard_Base_Path_Name : Storage::Standard_tmp;
+    QString pathToCheckSpace = isMounted ? Storage::SDCard_Base_Path_Name : gStandard_tmp;
     mCIsReady = driveSpaceCheck(pathToCheckSpace, mCTotal, mCAvailable, &mCIsReadOnly);
 
     //DEBUG: qDebug()<< "Checking space for path of : " << pathToCheckSpace << "   mCTotal " << mCTotal << " available  " << mCAvailable;
Index: sources/main.h
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rf9f59e63bc8412c38b50ec155bcc37d1535800c4
--- sources/main.h	(.../main.h)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/main.h	(.../main.h)	(revision f9f59e63bc8412c38b50ec155bcc37d1535800c4)
@@ -103,6 +103,7 @@
 extern bool       gEnableManufacturing      ;
 extern bool       gEnableUpdating           ;
 extern bool       gUseRootHome              ;
+extern QString    gStandard_tmp             ;
 
 
 //--------------------------------------------------------------------------------//
Index: sources/storage/FileHandler.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rf9f59e63bc8412c38b50ec155bcc37d1535800c4
--- sources/storage/FileHandler.cpp	(.../FileHandler.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/storage/FileHandler.cpp	(.../FileHandler.cpp)	(revision f9f59e63bc8412c38b50ec155bcc37d1535800c4)
@@ -24,6 +24,7 @@
 // Project
 // #include "Logger.h" // logger should not be used in this class.
 #include "StorageGlobals.h"
+#include "main.h"
 
 // namespace
 using namespace Storage;
@@ -304,7 +305,7 @@
     static bool tested  = false;
     if ( tested )  return ok;
 
-    QString tmp     = Storage::Standard_tmp;
+    QString tmp             = gStandard_tmp;
     QString tmpTestFolder   = tmp + "tmp_test_folder" ;
     QString tmpTestFile     = tmp + "tmp_test_file"   ;
     QString tmpTestContent  =       "tmp_test_content";
Index: sources/storage/Logger.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rf9f59e63bc8412c38b50ec155bcc37d1535800c4
--- sources/storage/Logger.cpp	(.../Logger.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/storage/Logger.cpp	(.../Logger.cpp)	(revision f9f59e63bc8412c38b50ec155bcc37d1535800c4)
@@ -234,7 +234,7 @@
 #endif
 
     if (vUseTempPath) {
-        _dir.setPath(Storage::Standard_tmp);
+        _dir.setPath(gStandard_tmp);
         // NOTE: Do not use LOG_XXXXX, At this moment Logger has not been initialized yet
         QString msg = QString("temp location used for events logging (%1)").arg(_dir.path());
         //DEBUG qDebug() << msg;
@@ -271,8 +271,8 @@
     QString basePath = Storage::Settings_Path();
 
     // use the Settings path first (/var/configurations (Encrypted Partition))
-    if ( ! QDir                     (basePath                       ).exists(   )) { basePath = Storage::Standard_tmp; goto lOut; }
-    if ( ! FileHandler::makeFolder  (basePath + Storage::Txr_Folder_Treatment   )) { basePath = Storage::Standard_tmp; goto lOut; }
+    if ( ! QDir                     (basePath                       ).exists(   )) { basePath = gStandard_tmp; goto lOut; }
+    if ( ! FileHandler::makeFolder  (basePath + Storage::Txr_Folder_Treatment   )) { basePath = gStandard_tmp; goto lOut; }
 
 lOut:
     _logPathNames[vLogType] = basePath + Storage::Txr_Folder_Treatment;
Index: sources/storage/StorageGlobals.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rf9f59e63bc8412c38b50ec155bcc37d1535800c4
--- sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision f9f59e63bc8412c38b50ec155bcc37d1535800c4)
@@ -31,11 +31,6 @@
  */
 namespace Storage
 {
-
-    /****** TO BE CONSISTENT, ALWAYS INCLUDE '/' AT THE END OF ALL THE FOLDER/DIR/PATH IN HERE ******/
-
-    const char *Standard_tmp = "/tmp/";
-
     const char *POST_LOG = "post.log"; // this file shall reside in the home folder where the application stored.
 
 
Index: sources/storage/StorageGlobals.h
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rf9f59e63bc8412c38b50ec155bcc37d1535800c4
--- sources/storage/StorageGlobals.h	(.../StorageGlobals.h)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/storage/StorageGlobals.h	(.../StorageGlobals.h)	(revision f9f59e63bc8412c38b50ec155bcc37d1535800c4)
@@ -22,9 +22,6 @@
  */
 namespace Storage
 {
-    // standard locations
-    extern const char *Standard_tmp;
-
     // POST
     extern const char *POST_LOG;