From c3342c3dc7cb2ca7ed1483eed4b8228e32e6397f Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 15 Jul 2024 09:21:51 +0200 Subject: [PATCH] TEST-55-OOMD: Remove the opensuse user@ dropin Required to make TEST-55-OOMD pass on OpenSUSE. (cherry picked from commit f65ec2e90483689546d4d700c5ad8475f19a3ab7) --- test/TEST-55-OOMD/meson.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/TEST-55-OOMD/meson.build b/test/TEST-55-OOMD/meson.build index adc0509786..2566316c93 100644 --- a/test/TEST-55-OOMD/meson.build +++ b/test/TEST-55-OOMD/meson.build @@ -5,6 +5,9 @@ integration_tests += [ 'name' : fs.name(meson.current_source_dir()), 'credentials' : integration_test_template['credentials'] + [ files('systemd.unit-dropin.init.scope'), + # OpenSUSE disables all controller delegation for the user manager template. Mask the + # dropin to make TEST-55-OOMD pass on OpenSUSE. + 'systemd.unit-dropin.user@.service~20-defaults-SUSE=', ], 'vm' : true, }, -- 2.25.1