Index: scripts/crypt_setup.sh =================================================================== diff -u -r803683ce55f7f96f0f1b53094ab2e9b32db4eac5 -r1e9d99fa2087d302e69c616b5a2420e010abe164 --- scripts/crypt_setup.sh (.../crypt_setup.sh) (revision 803683ce55f7f96f0f1b53094ab2e9b32db4eac5) +++ scripts/crypt_setup.sh (.../crypt_setup.sh) (revision 1e9d99fa2087d302e69c616b5a2420e010abe164) @@ -83,7 +83,7 @@ function create_luks_partition() { - umount_luks_partition + unmount_luks_partition checkOutput "sudo mkdir -p $LOC_VAR " $ERR_CRYPTSETUP_CREATE_MKDIR checkOutput "sudo cryptsetup luksFormat $LOC_DEV " $ERR_CRYPTSETUP_CREATE_FORMAT $PASSWORD @@ -100,19 +100,6 @@ checkOutput "sudo mount -t ext4 $LOC_MAP $LOC_VAR" $ERR_CRYPTSETUP_MOUNT_MOUNT } -function reset_luks_partition() -{ - # TODO this needs some discussions. - - #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 -} - function handleCommand() { # Handle the first argument to script, one of start, stop, erase, restart, force-reload or status case $1 in @@ -130,11 +117,6 @@ unmount_luks_partition ;; - decommission) - checkPassword - reset_luks_partition - ;; - *) echo "unknown command" exit $ERR_CRYPTSETUP_UNKNOWN