Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r9171bf54844dcec41ee5e6feb7ee4d87ef5ebbb4 -r8d5fe7d63e3d86e9d89d5f824347d34479e4e9ec
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 9171bf54844dcec41ee5e6feb7ee4d87ef5ebbb4)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 8d5fe7d63e3d86e9d89d5f824347d34479e4e9ec)
@@ -659,13 +659,16 @@
 
     if ( _deviceCryptSetupRequest._data.mCommand == "mount" ) emit didCryptSetupMount(model._data.mAccepted);
 
-    // move the configuration files if the encrypted partition creation was successful.
-    if ( _deviceCryptSetupRequest._data.mCommand != "setup" ) return;
-    if ( ! model._data.mAccepted                            ) return;
     QString msg = "";
     int     err = 0 ;
     //TODO  The Settings shall be the Singleton SettingsController and modify the MSettings like the others.
     Storage::Settings settings;
+    // moving the configuration files if the encrypted partition creation was successful.
+    if ( ! model._data.mAccepted                            ) goto lErr;
+    if ( gEnableUpdating                                    ) goto lMove;
+    if ( _deviceCryptSetupRequest._data.mCommand != "setup" ) goto lOut;
+
+lMove:
     err = settings.configurationsMove(&msg);
     if ( err ) {
         model._data.mAccepted   = false ;
@@ -674,6 +677,12 @@
         emit didAttributeResponse(model.data());
         LOG_APPED_UI(model.data().mMessage);
     }
+
+lOut:
+    return;
+
+lErr:
+    LOG_DEBUG(QString("Encrypted Partition %1 failed").arg(_deviceCryptSetupRequest._data.mCommand));
 }
 
 /////////////////////////////////////////////   DeviceBluetoothPaired
@@ -860,11 +869,11 @@
  */
 void DeviceController::checkConfugurationMountReady()
 {
-    /// in manufacturing the system is logged with root and configurations are in /home/root
+    /// in manufacturing or updating the system is logged with root and configurations are in /home/root
     /// therefore no need to mount the cononfiguraiton partition.
-    /// also for in manufacturing the partition is being set up
+    /// also for manufacturing the partition is being set up
     /// and is less steps for setup if the partition is not mounted.
-    if (     gEnableManufacturing     ) return;
+    if (     gEnableManufacturing     ) return; // it should do the mount when gEnableUpdating, therefore here should not add gEnableUpdating.
     if ( ! ( _hasThread && _hasSalt ) ) return;
 
     DeviceCryptSetupRequestData data;