Index: scripts/decommission.sh
===================================================================
diff -u -ra7693f04e693294338aa9829d14f4ed7aa99a7a5 -r83732d8d56e075bef087a6745eadd1b0b7d7ccbb
--- scripts/decommission.sh	(.../decommission.sh)	(revision a7693f04e693294338aa9829d14f4ed7aa99a7a5)
+++ scripts/decommission.sh	(.../decommission.sh)	(revision 83732d8d56e075bef087a6745eadd1b0b7d7ccbb)
@@ -76,59 +76,6 @@
     fi
 }
 
-# ==== For encrypted partition ====
-ERR_CRYPTSETUP_USAGE=101
-ERR_CRYPTSETUP_PASSWORD=102
-
-ERR_CRYPTSETUP_CREATE_MKDIR=121
-ERR_CRYPTSETUP_CREATE_FORMAT=122
-ERR_CRYPTSETUP_CREATE_OPEN=123
-ERR_CRYPTSETUP_CREATE_MKFS=124
-ERR_CRYPTSETUP_CREATE_MOUNT=125
-ERR_CRYPTSETUP_UNMOUNT_UNMOUNT=126
-ERR_CRYPTSETUP_UNMOUNT_CLOSE=127
-
-LOC_DEV="/dev/mmcblk0p7"
-LOC_DIR="configurations"
-LOC_MAP="/dev/mapper/"$LOC_DIR
-LOC_VAR="/var/"$LOC_DIR
-  	
-function checkPassword() {
-    if [ "$PASSWORD" == "" ]; then
-        echo "Error : Setup command missing password argument"
-        exit $ERR_CRYPTSETUP_PASSWORD
-    fi
-}
-
-function checkOutput() {
-    if [ "$3" == "" ]; then
-        out=`          eval "$1" 2>&1`
-    else
-        out=`echo $3 | eval "$1" 2>&1`
-    fi
-    if [ "$?" -ne 0 ]; then
-        echo $out
-        exit $2
-    fi
-}
-
-function unmount_luks_partition()
-{
-  	checkOutput "umount               $LOC_VAR          " $ERR_CRYPTSETUP_UNMOUNT_UNMOUNT
-    checkOutput "cryptsetup luksClose $LOC_DIR          " $ERR_CRYPTSETUP_UNMOUNT_CLOSE
-}
-
-function create_luks_partition()
-{
-    umount_luks_partition
-    
-    checkOutput "mkdir      -p         $LOC_VAR         " $ERR_CRYPTSETUP_CREATE_MKDIR
-    checkOutput "cryptsetup luksFormat $LOC_DEV         " $ERR_CRYPTSETUP_CREATE_FORMAT     $PASSWORD
-    checkOutput "cryptsetup luksOpen   $LOC_DEV $LOC_DIR" $ERR_CRYPTSETUP_CREATE_OPEN       $PASSWORD
-    checkOutput "mkfs.ext4             $LOC_MAP         " $ERR_CRYPTSETUP_CREATE_MKFS
-    checkOutput "mount      -t ext4    $LOC_MAP $LOC_VAR" $ERR_CRYPTSETUP_CREATE_MOUNT
-}
-
 # ------------------------------ Remove Wifi Conf
 removeSingleFile $LOC_WIFI_CONF "Failed to remove WiFi conf file" $ERR_FAILED_RM_WIFI_CONF
 
@@ -143,9 +90,18 @@
 clearFolderContent $LOC_LOG_PARENT_FOLDER "Failed to remove logs" $ERR_FAILED_CLEAR_LOGS
 
 # ------------------------------ Format Encrypted Partition
-checkPassword 
-create_luks_partition
+umountExitCode=$(source ./crypt_setup.sh umount)
+if [ "$umountExitCode" -ne 0 ]; then
+    echo "Error: Failed to unmount partition"
+    exit $umountExitCode
+fi
 
+setupExitCode=$(source ./crypt_setup.sh setup)
+if [ "$setupExitCode" -ne 0 ]; then
+    echo "Error: format the partition"
+    exit $setupExitCode
+fi
+
 # ------------------------------ Remove CloudSync Token
 clearFolderContent $LOC_CLOUDSYNC_TOKEN "Failed to remove CloudSync token" $ERR_FAILED_CLEAR_CLOUDSYNC_TOKEN