diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 08:38:45 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 08:38:45 +0000 |
commit | 435fbf74bfdf383db1238633326be558ef2d3ff2 (patch) | |
tree | a372c8e3c5f2fe60e812d5f6a73ce54872139ee2 /src | |
parent | Releasing progress-linux version 2:2.7.1-1~progress7.99u1. (diff) | |
download | cryptsetup-435fbf74bfdf383db1238633326be558ef2d3ff2.tar.xz cryptsetup-435fbf74bfdf383db1238633326be558ef2d3ff2.zip |
Merging upstream version 2:2.7.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | src/cryptsetup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cryptsetup.c b/src/cryptsetup.c index a46e2dd..fd580d7 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -3039,8 +3039,7 @@ static int opal_erase(struct crypt_device *cd, bool factory_reset) { r = tools_get_key(factory_reset ? _("Enter OPAL PSID: ") : _("Enter OPAL Admin password: "), &password, &password_size, ARG_UINT64(OPT_KEYFILE_OFFSET_ID), ARG_UINT32(OPT_KEYFILE_SIZE_ID), ARG_STR(OPT_KEY_FILE_ID), - ARG_UINT32(OPT_TIMEOUT_ID), verify_passphrase(0), - !ARG_SET(OPT_FORCE_PASSWORD_ID), cd); + ARG_UINT32(OPT_TIMEOUT_ID), verify_passphrase(0), 0, cd); if (r < 0) return r; |