oeqa/selftest/overlayfs: Improve systemd test configuration

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 <richard.purdie@linuxfoundation.org>

diff --git a/meta/lib/oeqa/selftest/cases/overlayfs.py b/meta/lib/oeqa/selftest/cases/overlayfs.py
index 580fbdcb9c3a78b7d03466719e660713c82731cd..d0a3bfdd3c7fce2fe79b09e4d748bb67c14b848b 100644 (file)
--- 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 = """