diff --git a/src/cryptsetup.c b/src/cryptsetup.c index c681c9d9..98da2b54 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -723,7 +723,7 @@ static int action_resize(void) if (ARG_SET(OPT_TOKEN_ONLY_ID) && r == -ENOANO) r = _try_token_pin_unlock(cd, ARG_INT32(OPT_TOKEN_ID_ID), NULL, ARG_STR(OPT_TOKEN_TYPE_ID), CRYPT_ACTIVATE_KEYRING_KEY, 1, true); - if (r >= 0 || ARG_SET(OPT_TOKEN_ONLY_ID)) + if (r >= 0 || quit || ARG_SET(OPT_TOKEN_ONLY_ID)) goto out; r = tools_get_key(NULL, &password, &passwordLen, @@ -1495,7 +1495,7 @@ static int action_open_luks(void) if (ARG_SET(OPT_TOKEN_ONLY_ID) && r == -ENOANO) r = _try_token_pin_unlock(cd, ARG_INT32(OPT_TOKEN_ID_ID), activated_name, ARG_STR(OPT_TOKEN_TYPE_ID), activate_flags, set_tries_tty(), true); - if (r >= 0 || r == -EEXIST || ARG_SET(OPT_TOKEN_ONLY_ID)) + if (r >= 0 || r == -EEXIST || quit || ARG_SET(OPT_TOKEN_ONLY_ID)) goto out; tries = set_tries_tty(); @@ -2239,7 +2239,7 @@ static int action_luksResume(void) if (ARG_SET(OPT_TOKEN_ONLY_ID) && r == -ENOANO) r = _try_token_pin_unlock(cd, ARG_INT32(OPT_TOKEN_ID_ID), action_argv[0], ARG_STR(OPT_TOKEN_TYPE_ID), 0, set_tries_tty(), false); - if (r >= 0 || ARG_SET(OPT_TOKEN_ONLY_ID)) + if (r >= 0 || quit || ARG_SET(OPT_TOKEN_ONLY_ID)) goto out; tries = set_tries_tty();