From 7532bc8718eb1c90fc822c2742bc2439ab6604e9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 24 Jul 2025 03:34:26 +0900 Subject: [PATCH] TEST-04-JOURNAL: use bash to make builtin echo command used When non-builtin echo command is used, then the command may exit before journald find the source of the stream, and the log filtering may not be applied. Hopefully fixes #37143. --- .../TEST-04-JOURNAL.units/logs-filtering.service | 2 +- test/units/delegated_cgroup_filtering_payload.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service b/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service index 6eca47d1fa4..3d286959024 100644 --- a/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service +++ b/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service @@ -5,6 +5,6 @@ Description=Log filtering unit Type=oneshot # If the service finishes extremely fast, journald cannot find the source of the # stream. Hence, we need to call 'journalctl --sync' before service finishes. -ExecStart=sh -c 'echo "Logging from the service, and ~more~ foo bar"; journalctl --sync' +ExecStart=bash -c 'echo "Logging from the service, and ~more~ foo bar"; journalctl --sync' SyslogLevel=notice LogLevelMax=info diff --git a/test/units/delegated_cgroup_filtering_payload.sh b/test/units/delegated_cgroup_filtering_payload.sh index 6084ae8dcb5..505dcf0cbe1 100755 --- a/test/units/delegated_cgroup_filtering_payload.sh +++ b/test/units/delegated_cgroup_filtering_payload.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # SPDX-License-Identifier: LGPL-2.1-or-later mkdir /sys/fs/cgroup/system.slice/delegated-cgroup-filtering.service/the_child -- 2.47.3