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 | |
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>
-rw-r--r-- | meta/lib/oeqa/selftest/cases/imagefeatures.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/overlayfs.py | 8 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runtime_test.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py index 0292c882f2..a5e069d0be 100644 --- a/meta/lib/oeqa/selftest/cases/imagefeatures.py +++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py | |||
@@ -250,7 +250,7 @@ USERADD_GID_TABLES += "files/static-group" | |||
250 | DISTRO_FEATURES:append = " pam opengl wayland" | 250 | DISTRO_FEATURES:append = " pam opengl wayland" |
251 | 251 | ||
252 | # Switch to systemd | 252 | # Switch to systemd |
253 | DISTRO_FEATURES:append = " systemd" | 253 | DISTRO_FEATURES:append = " systemd usrmerge" |
254 | VIRTUAL-RUNTIME_init_manager = "systemd" | 254 | VIRTUAL-RUNTIME_init_manager = "systemd" |
255 | VIRTUAL-RUNTIME_initscripts = "" | 255 | VIRTUAL-RUNTIME_initscripts = "" |
256 | VIRTUAL-RUNTIME_syslog = "" | 256 | VIRTUAL-RUNTIME_syslog = "" |
diff --git a/meta/lib/oeqa/selftest/cases/overlayfs.py b/meta/lib/oeqa/selftest/cases/overlayfs.py index b4f0663828..4031ded0fe 100644 --- a/meta/lib/oeqa/selftest/cases/overlayfs.py +++ b/meta/lib/oeqa/selftest/cases/overlayfs.py | |||
@@ -58,7 +58,7 @@ inherit overlayfs | |||
58 | 58 | ||
59 | config = """ | 59 | config = """ |
60 | IMAGE_INSTALL:append = " overlayfs-user" | 60 | IMAGE_INSTALL:append = " overlayfs-user" |
61 | DISTRO_FEATURES:append = " systemd overlayfs" | 61 | DISTRO_FEATURES:append = " systemd overlayfs usrmerge" |
62 | """ | 62 | """ |
63 | 63 | ||
64 | self.write_config(config) | 64 | self.write_config(config) |
@@ -79,7 +79,7 @@ DISTRO_FEATURES:append = " systemd overlayfs" | |||
79 | 79 | ||
80 | config = """ | 80 | config = """ |
81 | IMAGE_INSTALL:append = " overlayfs-user" | 81 | IMAGE_INSTALL:append = " overlayfs-user" |
82 | DISTRO_FEATURES += "systemd overlayfs" | 82 | DISTRO_FEATURES += "systemd overlayfs usrmerge" |
83 | OVERLAYFS_QA_SKIP[mnt-overlay] = "mount-configured" | 83 | OVERLAYFS_QA_SKIP[mnt-overlay] = "mount-configured" |
84 | """ | 84 | """ |
85 | 85 | ||
@@ -97,7 +97,7 @@ OVERLAYFS_QA_SKIP[mnt-overlay] = "mount-configured" | |||
97 | 97 | ||
98 | config = """ | 98 | config = """ |
99 | IMAGE_INSTALL:append = " overlayfs-user" | 99 | IMAGE_INSTALL:append = " overlayfs-user" |
100 | DISTRO_FEATURES:append = " systemd overlayfs" | 100 | DISTRO_FEATURES:append = " systemd overlayfs usrmerge" |
101 | """ | 101 | """ |
102 | 102 | ||
103 | self.write_config(config) | 103 | self.write_config(config) |
@@ -115,7 +115,7 @@ DISTRO_FEATURES:append = " systemd overlayfs" | |||
115 | 115 | ||
116 | config = """ | 116 | config = """ |
117 | IMAGE_INSTALL:append = " overlayfs-user" | 117 | IMAGE_INSTALL:append = " overlayfs-user" |
118 | DISTRO_FEATURES:append = " systemd overlayfs" | 118 | DISTRO_FEATURES:append = " systemd overlayfs usrmerge" |
119 | """ | 119 | """ |
120 | 120 | ||
121 | wrong_machine_config = """ | 121 | wrong_machine_config = """ |
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' |