VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/DcsBoot
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2019-11-08 23:06:25 +0100
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2019-11-08 23:07:42 +0100
commit2d4d3ab4ed0ee86d46fe2b44ca1e56a3d2916f68 (patch)
tree92955bebea443f32e47c38892e59a34da3624072 /DcsBoot
parent4566f95fd9f70530866457beb545a794cc80e1d0 (diff)
downloadVeraCrypt-DCS-2d4d3ab4ed0ee86d46fe2b44ca1e56a3d2916f68.tar.gz
VeraCrypt-DCS-2d4d3ab4ed0ee86d46fe2b44ca1e56a3d2916f68.zip
Fix "ActionFailed" not working and add "ActionCancelled" to customize handling of user hitting ESC on password prompt
Diffstat (limited to 'DcsBoot')
-rw-r--r--DcsBoot/DcsBoot.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/DcsBoot/DcsBoot.c b/DcsBoot/DcsBoot.c
index 080b052..7029a10 100644
--- a/DcsBoot/DcsBoot.c
+++ b/DcsBoot/DcsBoot.c
@@ -201,7 +201,11 @@ DcsBootMain(
// Authorize
gBS->SetWatchdogTimer(0, 0, 0, NULL);
res = EfiExec(NULL, L"\\EFI\\VeraCrypt\\DcsInt.dcs");
- if (EFI_ERROR(res)) {
+ if (EFI_ERROR(res) && (res != EFI_DCS_POSTEXEC_REQUESTED)) {
+
+ // Clear DcsExecPartGuid before execute OS to avoid problem in VirtualBox with reboot.
+ EfiSetVar(L"DcsExecPartGuid", NULL, NULL, 0, EFI_VARIABLE_BOOTSERVICE_ACCESS);
+ EfiSetVar(L"DcsExecCmd", NULL, NULL, 0, EFI_VARIABLE_BOOTSERVICE_ACCESS);
// ERR_PRINT(L"\nDcsInt.efi %r\n",res);
if (res == EFI_DCS_SHUTDOWN_REQUESTED)
{