From 2b251491debf9cab695f5f34da9908ca46f085fe Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Tue, 19 Nov 2024 11:26:49 +0100 Subject: [PATCH] cryptenroll: show better log message if slot to wipe does not exist ``` $ systemd-cryptenroll /dev/vda3 SLOT TYPE 0 password $ systemd-cryptenroll --wipe-slot 1 /dev/vda3 Failed to wipe slot 1, continuing: No such file or directory ``` --- src/cryptenroll/cryptenroll-wipe.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cryptenroll/cryptenroll-wipe.c b/src/cryptenroll/cryptenroll-wipe.c index 703342f7582..67c3795d346 100644 --- a/src/cryptenroll/cryptenroll-wipe.c +++ b/src/cryptenroll/cryptenroll-wipe.c @@ -427,7 +427,10 @@ int wipe_slots(struct crypt_device *cd, for (size_t i = n_ordered_slots; i > 0; i--) { r = crypt_keyslot_destroy(cd, ordered_slots[i - 1]); if (r < 0) { - log_warning_errno(r, "Failed to wipe slot %i, continuing: %m", ordered_slots[i - 1]); + if (r == -ENOENT) + log_warning_errno(r, "Failed to wipe non-existent slot %i, continuing.", ordered_slots[i - 1]); + else + log_warning_errno(r, "Failed to wipe slot %i, continuing: %m", ordered_slots[i - 1]); if (ret == 0) ret = r; } else