We need to ensure that sysvinit and systemd are not enabled together. Tweak the tests to use INIT_MANAGER to correctly achieve this.
Signed-off-by: Richard Purdie <[email protected]> --- meta/lib/oeqa/selftest/cases/overlayfs.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/overlayfs.py b/meta/lib/oeqa/selftest/cases/overlayfs.py index 580fbdcb9c3..d0a3bfdd3c7 100644 --- a/meta/lib/oeqa/selftest/cases/overlayfs.py +++ b/meta/lib/oeqa/selftest/cases/overlayfs.py @@ -58,7 +58,8 @@ inherit overlayfs config = """ IMAGE_INSTALL:append = " overlayfs-user" -DISTRO_FEATURES:append = " systemd overlayfs usrmerge" +INIT_MANAGER = "systemd" +DISTRO_FEATURES:append = " overlayfs" """ self.write_config(config) @@ -79,7 +80,8 @@ DISTRO_FEATURES:append = " systemd overlayfs usrmerge" config = """ IMAGE_INSTALL:append = " overlayfs-user" -DISTRO_FEATURES:append = " systemd overlayfs usrmerge" +INIT_MANAGER = "systemd" +DISTRO_FEATURES:append = " overlayfs" OVERLAYFS_QA_SKIP[mnt-overlay] = "mount-configured" """ @@ -97,7 +99,8 @@ OVERLAYFS_QA_SKIP[mnt-overlay] = "mount-configured" config = """ IMAGE_INSTALL:append = " overlayfs-user" -DISTRO_FEATURES:append = " systemd overlayfs usrmerge" +INIT_MANAGER = "systemd" +DISTRO_FEATURES:append = " overlayfs" """ self.write_config(config) @@ -115,7 +118,8 @@ DISTRO_FEATURES:append = " systemd overlayfs usrmerge" config = """ IMAGE_INSTALL:append = " overlayfs-user" -DISTRO_FEATURES:append = " systemd overlayfs usrmerge" +INIT_MANAGER = "systemd" +DISTRO_FEATURES:append = " overlayfs" """ wrong_machine_config = """
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#231187): https://lists.openembedded.org/g/openembedded-core/message/231187 Mute This Topic: https://lists.openembedded.org/mt/117836077/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
