From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 25 Mar 2020 12:43:20 +0000 (+0100)
Subject: test: use systemd.status-unit-format=name in all but one test
X-Git-Tag: v246-rc1~601^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a455e75a309814f2b9947a70356dbbb3aad5a982;p=thirdparty%2Fsystemd.git

test: use systemd.status-unit-format=name in all but one test

We want to test the traditional output, but the non-default one is generally
much nicer for debugging (and takes less space...).
---

diff --git a/test/test-functions b/test/test-functions
index ead815f2fab..ee2dca64f8e 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -919,6 +919,12 @@ install_config_files() {
 
     # set the hostname
     echo systemd-testsuite > $initdir/etc/hostname
+
+    # let's set up just one image with the traditional verbose output
+    if [ ${IMAGE_NAME} != "basic" ]; then
+        mkdir -p $initdir/etc/systemd/system.conf.d
+        echo -e '[Manager]\nStatusUnitFormat=name' >$initdir/etc/systemd/system.conf.d/status.conf
+    fi
 }
 
 install_basic_tools() {