diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-10 20:23:22 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-11 13:22:01 +0100 |
commit | 67a8dcabda44560e66b3daeb68f185356694a2db (patch) | |
tree | ba404561fa337a0c78b4b2097533523036c47158 /meta/lib/oeqa/selftest/cases/runtime_test.py | |
parent | 2c4cb6dba3825421a92154a866f7481147fb390e (diff) | |
download | poky-67a8dcabda44560e66b3daeb68f185356694a2db.tar.gz |
selftest: Ensure usrmerge is enabled with systemd
systemd now requires usrmerge, ensure this is always the case in
our test cases.
(From OE-Core rev: 465bf84c523403ccc7dc6ed8c2a9c32d85929e8c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/runtime_test.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runtime_test.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 81b8d056cc..463679dd32 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py | |||
@@ -294,7 +294,7 @@ class Postinst(OESelftestTestCase): | |||
294 | features += 'IMAGE_FEATURES += "package-management empty-root-password"\n' | 294 | features += 'IMAGE_FEATURES += "package-management empty-root-password"\n' |
295 | features += 'PACKAGE_CLASSES = "%s"\n' % classes | 295 | features += 'PACKAGE_CLASSES = "%s"\n' % classes |
296 | if init_manager == "systemd": | 296 | if init_manager == "systemd": |
297 | features += 'DISTRO_FEATURES:append = " systemd"\n' | 297 | features += 'DISTRO_FEATURES:append = " systemd usrmerge"\n' |
298 | features += 'VIRTUAL-RUNTIME_init_manager = "systemd"\n' | 298 | features += 'VIRTUAL-RUNTIME_init_manager = "systemd"\n' |
299 | features += 'DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"\n' | 299 | features += 'DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"\n' |
300 | features += 'VIRTUAL-RUNTIME_initscripts = ""\n' | 300 | features += 'VIRTUAL-RUNTIME_initscripts = ""\n' |