From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 13 Feb 2026 23:59:25 +0000 (+0000)
Subject: oeqa/selftest/overlayfs: Improve systemd test configuration
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41ddc84609d86ec1f0646241f622ff6ec2106a06;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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 580fbdcb9c..d0a3bfdd3c 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 = """