1
0
mirror of https://github.com/systemd/systemd synced 2025-10-05 16:03:15 +02:00

mkosi: Move TEST-24-CRYPTSETUP files to mkosi/ directory

If the integration tests have been installed in the systemd-tests
package, the path to these in mkosi.postinst.chroot will be wrong.
Let's fix the issue by moving these files into the mkosi/ directory
as they're only used by mkosi regardless so they make more sense to
be there anyway.
This commit is contained in:
Daan De Meyer
2025-04-09 15:31:21 +02:00
parent 8b1c66f72c
commit e2b01571d0
5 changed files with 4 additions and 5 deletions

View File

@@ -59,8 +59,8 @@ SYSTEMD_REPART_MKFS_OPTIONS_EXT4="" \
--dry-run=no \
--size=auto \
--offline=true \
--root test/integration-tests/TEST-24-CRYPTSETUP \
--definitions test/integration-tests/TEST-24-CRYPTSETUP/keydev.repart \
--root mkosi/mkosi.credentials \
--definitions mkosi/keydev.repart \
"$OUTPUTDIR/keydev.raw"
can_test_pkcs11() {
@@ -133,7 +133,7 @@ EOF
certtool --generate-self-signed \
--load-privkey="pkcs11:token=TestToken;object=RSATestKey;type=private" \
--load-pubkey="pkcs11:token=TestToken;object=RSATestKey;type=public" \
--template "test/integration-tests/TEST-24-CRYPTSETUP/template.cfg" \
--template "mkosi/template.cfg" \
--outder --outfile "/tmp/rsa_test.crt"
pkcs11-tool --module "$SOFTHSM_MODULE" --token-label "TestToken" --pin "env:GNUTLS_PIN" --so-pin "env:GNUTLS_SO_PIN" --write-object "/tmp/rsa_test.crt" --type cert --label "RSATestKey"
@@ -145,7 +145,7 @@ EOF
certtool --generate-self-signed \
--load-privkey="pkcs11:token=TestToken;object=ECTestKey;type=private" \
--load-pubkey="pkcs11:token=TestToken;object=ECTestKey;type=public" \
--template "test/integration-tests/TEST-24-CRYPTSETUP/template.cfg" \
--template "mkosi/template.cfg" \
--outder --outfile "/tmp/ec_test.crt"
pkcs11-tool --module "$SOFTHSM_MODULE" --token-label "TestToken" --pin "env:GNUTLS_PIN" --so-pin "env:GNUTLS_SO_PIN" --write-object "/tmp/ec_test.crt" --type cert --label "ECTestKey"

View File

@@ -4,7 +4,6 @@ integration_tests += [
integration_test_template + {
'name' : fs.name(meson.current_source_dir()),
'credentials' : integration_test_template['credentials'] + [
files('keyfile'),
'fstab.extra="/dev/mapper/test24_varcrypt /var ext4 defaults 0 1"',
],
'cmdline' : [