Revert "core: Add information on which condition failed to job skipped format string"

This reverts commit c97bef458b6e59079c9613ec755c1c6513c1c655.
cryptsetup: drop an unused variable
2026-03-26 08:44:55 +01:00 · 2021-08-27 00:36:07 +09:00 · 2021-08-26 13:13:08 +01:00 · 2021-08-26 10:27:10 +01:00 · 2021-08-26 10:25:32 +01:00 · 2021-08-26 10:24:13 +01:00
3 changed files with 16 additions and 3 deletions
--- a/hwdb.d/60-keyboard.hwdb
+++ b/hwdb.d/60-keyboard.hwdb
@ -709,6 +709,10 @@ evdev:name:gpio-keys:phys:gpio-keys/input0:ev:3:dmi:*:svnHewlett-Packard:pnHPStr
 evdev:name:gpio-keys:phys:gpio-keys/input0:ev:23:dmi:*:svnHewlett-Packard:pnHPStream7Tablet:*
 KEYBOARD_KEY_0=unknown
 # HP Omen 15
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP:pnOMENLaptop15*:pvr*
 KEYBOARD_KEY_a1=!calc
 ##########################################################
 # Huawei
 ##########################################################
--- a/hwdb.d/60-sensor.hwdb
+++ b/hwdb.d/60-sensor.hwdb
@ -403,6 +403,16 @@ sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:bd03/20/201
 sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:bd05/25/2017:svnDefaultstring:pnDefaultstring:pvrDefaultstring:rvnAMICorporation:rnDefaultstring:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:*
 ACCEL_LOCATION=base
 #########################################
 # Hometech
 ########################################
 # Nobody bothered to use Linux on any device of this manufacturer
 # so current marks might be too general and need fixes.
 # These values are based on Wi101 model.
 sensor:modalias:acpi:BMA250E*:dmi:*:svnInsyde*:pni101c:*
 ACCEL_MOUNT_MATRIX=0,1,0;-1,0,0;-1,0,0
 #########################################
 # HP
 #########################################
--- a/src/cryptsetup/cryptsetup-tokens/luks2-fido2.c
+++ b/src/cryptsetup/cryptsetup-tokens/luks2-fido2.c
@ -20,7 +20,6 @@ int acquire_luks2_key(
        int r;
        Fido2EnrollFlags required;
        size_t cid_size, salt_size, decrypted_key_size;
        _cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
        _cleanup_free_ void *cid = NULL, *salt = NULL;
        _cleanup_free_ char *rp_id = NULL;
        _cleanup_(erase_and_freep) void *decrypted_key = NULL;
@ -53,7 +52,7 @@ int acquire_luks2_key(
                        required,
                        &decrypted_key,
                        &decrypted_key_size);
-        if (r == -ENOLCK) /* libcryptsetup returns -ENOANO also on wrong pin */
+        if (r == -ENOLCK) /* libcryptsetup returns -ENOANO also on wrong PIN */
                r = -ENOANO;
        if (r < 0)
                return r;
@ -61,7 +60,7 @@ int acquire_luks2_key(
        /* Before using this key as passphrase we base64 encode it, for compat with homed */
        r = base64mem(decrypted_key, decrypted_key_size, &base64_encoded);
        if (r < 0)
-                return crypt_log_error_errno(cd, r, "Can not base64 encode key: %m");
+                return crypt_log_error_errno(cd, r, "Failed to base64 encode key: %m");
        *ret_keyslot_passphrase = TAKE_PTR(base64_encoded);
        *ret_keyslot_passphrase_size = strlen(*ret_keyslot_passphrase);
Author	SHA1	Message	Date
Lennart Poettering	b8643ee2ea	Revert "core: Add information on which condition failed to job skipped format string" This reverts commit c97bef458b6e59079c9613ec755c1c6513c1c655.	2021-08-27 00:36:07 +09:00
Frantisek Sumsal	061f0084eb	cryptsetup: drop an unused variable This fixes compilation with new-enough libcryptsetup (2.4.0+) & clang: ``` $ CC=clang CXX=clang++ meson build --werror -Dlibcryptsetup-plugins=true ... $ ninja -C build ... ../src/cryptsetup/cryptsetup-tokens/luks2-fido2.c:23:53: error: unused variable 'v' [-Werror,-Wunused-variable] _cleanup_(json_variant_unrefp) JsonVariant *v = NULL; ... ```	2021-08-26 13:13:08 +01:00
Wind/owZ	f7327a485b	hwdb: Add sensor rule for Hometech Wi101 This commit was done to add sensor rule for Hometech Wi101. Note that this rule might be too general and need fixes. I couldn't test this on any other device since this one is the only one I have. Co-authored-by: Simeonlps <Simeonlps@users.noreply.github.com> Signed-off-by: Wind/owZ <windowz414@gnuweeb.org>	2021-08-26 10:27:10 +01:00
I-dont-need-name	6f2353a2ce	hwdb: Add force-release for HP Omen 15 calculator key. (#20538 ) * Add force-release for HP Omen 15 calculator key. The key doesn't create release event so I have come up with this fix to make it work properly.	2021-08-26 10:25:32 +01:00
Daan De Meyer	c97bef458b	core: Add information on which condition failed to job skipped format string When a job is skipped, it's useful to know exactly which condition failed so let's add this information to the error message. Because we now return an allocated string from job_done_message_format(), make sure we strdup() the other formats as well so the caller can safely free the string returned by job_done_message_format().	2021-08-26 10:24:13 +01:00