shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

Merge pull request #23213 from bluca/jammy

Browse Source 
Fixes for Jammy CI
This commit is contained in:
Luca Boccassi 2022-10-03 13:58:09 +01:00 committed by GitHub
commit 8bd1dcc6e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/partition/repart.c
View File

@ -3788,7 +3788,7 @@ static int context_verity_sig(Context *context) {
_cleanup_free_ char *text = NULL; _cleanup_free_ char *text = NULL;
Partition *hp; Partition *hp;
uint8_t fp[X509_FINGERPRINT_SIZE]; uint8_t fp[X509_FINGERPRINT_SIZE];
size_t sigsz, padsz; size_t sigsz = 0, padsz; /* avoid false maybe-uninitialized warning */
if (p->dropped) if (p->dropped)
continue; continue;

3
test/units/testsuite-70.sh
View File

@ -33,7 +33,8 @@ env PIN=123456 /usr/lib/systemd/systemd-cryptsetup attach test-volume $img - tpm
env PIN=123457 /usr/lib/systemd/systemd-cryptsetup attach test-volume $img - tpm2-device=auto,headless=1 && { echo 'unexpected success'; exit 1; } env PIN=123457 /usr/lib/systemd/systemd-cryptsetup attach test-volume $img - tpm2-device=auto,headless=1 && { echo 'unexpected success'; exit 1; }
# Check LUKS2 token plugin unlock (i.e. without specifying tpm2-device=auto) # Check LUKS2 token plugin unlock (i.e. without specifying tpm2-device=auto)
if cryptsetup --help | grep -q 'LUKS2 external token plugin support is compiled-in'; then if cryptsetup --help | grep -q 'LUKS2 external token plugin support is compiled-in' && \
[ -f "$(cryptsetup --help | sed -n -r 's/.*LUKS2 external token plugin path: (.*)\./\1/p')/libcryptsetup-token-systemd-tpm2.so" ]; then
env PIN=123456 /usr/lib/systemd/systemd-cryptsetup attach test-volume $img - headless=1 env PIN=123456 /usr/lib/systemd/systemd-cryptsetup attach test-volume $img - headless=1
/usr/lib/systemd/systemd-cryptsetup detach test-volume /usr/lib/systemd/systemd-cryptsetup detach test-volume