SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TEST-54-CREDS: Specify SMBIOS creds via corresponding mkosi option

Browse Source 
This allows mkosi to combine fstab.extra with its own fstab.extra so
that it doesn't override the one we pass for the test.
This commit is contained in:
Daan De Meyer
2024-07-25 13:12:16 +02:00
parent 8da8d6ce30
commit ebe17e3f9e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/TEST-54-CREDS/meson.build
+6 -6
View File
@@ -17,15 +17,15 @@ integration_tests += [
files('systemd.extra-unit.my-service.service'),
files('systemd.unit-dropin.my-service.service'),
files('systemd.unit-dropin.my-service.service~30-named.service'),
'smbioscredential=magicdata',
'binarysmbioscredential=magicbinarydata',
'sysusers.extra="u credtestuser"',
'tmpfiles.extra="f /tmp/sourcedfromcredential - - - - tmpfilessecret"',
'fstab.extra="injected /injected tmpfs X-mount.mkdir 0 0"',
'getty.ttys.container=idontexist',
],
'qemu-args' : integration_test_template['qemu-args'] + [
'-fw_cfg', 'name=opt/io.systemd.credentials/myqemucredential,string=othervalue',
'-smbios', 'type=11,value=io.systemd.credential:smbioscredential=magicdata',
'-smbios', 'type=11,value=io.systemd.credential.binary:binarysmbioscredential=bWFnaWNiaW5hcnlkYXRh',
'-smbios', 'type=11,value=io.systemd.credential.binary:sysusers.extra=dSBjcmVkdGVzdHVzZXIK',
'-smbios', 'type=11,value=io.systemd.credential.binary:tmpfiles.extra=ZiAvdG1wL3NvdXJjZWRmcm9tY3JlZGVudGlhbCAtIC0gLSAtIHRtcGZpbGVzc2VjcmV0Cg==',
'-smbios', 'type=11,value=io.systemd.credential.binary:fstab.extra=aW5qZWN0ZWQgL2luamVjdGVkIHRtcGZzIFgtbW91bnQubWtkaXIgMCAwCg==',
'-smbios', 'type=11,value=io.systemd.credential:getty.ttys.container=idontexist',
],
'firmware' : 'auto',
},