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

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.

diff --git a/test/TEST-54-CREDS/meson.build b/test/TEST-54-CREDS/meson.build
index f725035e3f774b0a8126b6a0075ac03b0e6daa39..99524b9d6edbd7226704f74e0264eb912f324727 100644 (file)
--- a/test/TEST-54-CREDS/meson.build
+++ b/test/TEST-54-CREDS/meson.build
@@ -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',
         },