daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From a714212703b3fe5f2a27773602cabbc4ab53da15 Mon Sep 17 00:00:00 2001
803fb7
From: Martin Pitt <martin.pitt@ubuntu.com>
803fb7
Date: Mon, 15 Jun 2015 08:59:44 +0200
803fb7
Subject: [PATCH] sysv-generator test: always log to console
803fb7
803fb7
Set $SYSTEMD_LOG_TARGET so that the output always goes to stdout/stderr. This
803fb7
fixes running the test as root, as that logged to the journal previously.
803fb7
803fb7
https://github.com/systemd/systemd/issues/195
803fb7
803fb7
Cherry-picked from: 6b7d32add4733a83f86e18bb86f914037a6688b7
803fb7
Resolves: #1279034
803fb7
---
803fb7
 test/sysv-generator-test.py | 1 +
803fb7
 1 file changed, 1 insertion(+)
803fb7
803fb7
diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
803fb7
index e716d705c..153786417 100644
803fb7
--- a/test/sysv-generator-test.py
803fb7
+++ b/test/sysv-generator-test.py
803fb7
@@ -60,6 +60,7 @@ class SysvGeneratorTest(unittest.TestCase):
803fb7
         '''
803fb7
         env = os.environ.copy()
803fb7
         env['SYSTEMD_LOG_LEVEL'] = 'debug'
803fb7
+        env['SYSTEMD_LOG_TARGET'] = 'console'
803fb7
         env['SYSTEMD_SYSVINIT_PATH'] = self.init_d_dir
803fb7
         env['SYSTEMD_SYSVRCND_PATH'] = self.rcnd_dir
803fb7
         env['SYSTEMD_UNIT_PATH'] = self.unit_dir