Skip to content

Commit c7f6906

Browse files
authored
Use “unmount” instead of “dismount” in scripts and in text shown to the user. (#1548)
1 parent 0f509db commit c7f6906

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

Tests/bench.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ if not exist !mydriveletter!:\ (
6161
goto :exit
6262
)
6363

64-
"!VERACRYPT_PATH!" /dismount !mydriveletter! /silent /q
64+
"!VERACRYPT_PATH!" /unmount !mydriveletter! /silent /q
6565
exit /b
6666

6767
:: Subroutine to measure the time taken for a command to execute

contrib/EncryptData.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
.DESCRIPTION
77
• Chooses an exFAT cluster size (auto or explicit).
88
• Calculates the minimum container size using an iterative approach for FAT/Bitmap sizing, plus safety margin.
9-
• Creates, mounts, copies, verifies, and dismounts – all guarded by -WhatIf/-Confirm (SupportsShouldProcess).
9+
• Creates, mounts, copies, verifies, and unmounts – all guarded by -WhatIf/-Confirm (SupportsShouldProcess).
1010
• Finds VeraCrypt automatically or takes a -VeraCryptDir override.
1111
• Encryption and hash algorithms are parameters.
1212
• Password can be passed via SecureString prompt or pipeline.
@@ -420,13 +420,13 @@ try {
420420
} finally {
421421
if (Test-Path variable:plainPassword) { Clear-Variable plainPassword -ErrorAction SilentlyContinue }
422422
if ($mounted) {
423-
if ($PSCmdlet.ShouldProcess("Drive $driveLetter", "Dismount VeraCrypt volume")) {
424-
Write-Verbose "Dismounting drive $driveLetter..."
425-
$dismountArgs = @('/dismount', $driveLetter, '/force', '/quit', '/silent')
426-
Start-Process -FilePath $VeraCryptExe -ArgumentList $dismountArgs -NoNewWindow -Wait -ErrorAction SilentlyContinue
427-
Write-Verbose "Dismount command issued."
423+
if ($PSCmdlet.ShouldProcess("Drive $driveLetter", "Unmount VeraCrypt volume")) {
424+
Write-Verbose "Unmounting drive $driveLetter..."
425+
$unmountArgs = @('/unmount', $driveLetter, '/force', '/quit', '/silent')
426+
Start-Process -FilePath $VeraCryptExe -ArgumentList $unmountArgs -NoNewWindow -Wait -ErrorAction SilentlyContinue
427+
Write-Verbose "Unmount command issued."
428428
} else {
429-
Write-Host "Dismount skipped due to -WhatIf."
429+
Write-Host "Unmount skipped due to -WhatIf."
430430
}
431431
}
432432
foreach($f in @($errFile,$mountFile) | Where-Object { $_ }) {

src/Build/Packaging/debian-control/prerm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
V="$(mount | grep veracrypt_aux_mnt)"
33
if [ ! -z "$V" ]
44
then
5-
echo "Error: All VeraCrypt volumes must be dismounted first." >&2
5+
echo "Error: All VeraCrypt volumes must be unmounted first." >&2
66
exit 1
77
else
88
exit 0

src/Build/Packaging/rpm-control/prerm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
V="$(mount | grep veracrypt_aux_mnt)"
33
if [ ! -z "$V" ]
44
then
5-
echo "Error: All VeraCrypt volumes must be dismounted first." >&2
5+
echo "Error: All VeraCrypt volumes must be unmounted first." >&2
66
exit 1
77
else
88
exit 0

0 commit comments

Comments
 (0)